projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bump version
[dcpomatic.git]
/
src
/
lib
/
wscript
diff --git
a/src/lib/wscript
b/src/lib/wscript
index ebd316a0c174b88420d05b95fb64aeb432532587..72e149879196a20873dbfdb1bc698b06a1320d85 100644
(file)
--- a/
src/lib/wscript
+++ b/
src/lib/wscript
@@
-30,25
+30,32
@@
sources = """
ffmpeg_examiner.cc
film.cc
filter.cc
ffmpeg_examiner.cc
film.cc
filter.cc
+ internet.cc
image.cc
image_content.cc
image_decoder.cc
image_examiner.cc
image.cc
image_content.cc
image_decoder.cc
image_examiner.cc
+ image_proxy.cc
job.cc
job_manager.cc
kdm.cc
job.cc
job_manager.cc
kdm.cc
+ json_server.cc
log.cc
log.cc
+ piece.cc
player.cc
player.cc
+ player_video_frame.cc
playlist.cc
ratio.cc
resampler.cc
scp_dcp_job.cc
scaler.cc
playlist.cc
ratio.cc
resampler.cc
scp_dcp_job.cc
scaler.cc
+ send_kdm_email_job.cc
server.cc
server_finder.cc
sndfile_content.cc
sndfile_decoder.cc
sound_processor.cc
server.cc
server_finder.cc
sndfile_content.cc
sndfile_decoder.cc
sound_processor.cc
+ subtitle.cc
subtitle_content.cc
subtitle_decoder.cc
timer.cc
subtitle_content.cc
subtitle_decoder.cc
timer.cc
@@
-56,6
+63,7
@@
sources = """
transcoder.cc
types.cc
ui_signaller.cc
transcoder.cc
types.cc
ui_signaller.cc
+ update.cc
util.cc
video_content.cc
video_decoder.cc
util.cc
video_content.cc
video_decoder.cc
@@
-63,7
+71,7
@@
sources = """
"""
def build(bld):
"""
def build(bld):
- if bld.env.STATIC:
+ if bld.env.
BUILD_
STATIC:
obj = bld(features = 'cxx cxxstlib')
else:
obj = bld(features = 'cxx cxxshlib')
obj = bld(features = 'cxx cxxstlib')
else:
obj = bld(features = 'cxx cxxshlib')
@@
-72,17
+80,20
@@
def build(bld):
obj.export_includes = ['..']
obj.uselib = """
AVCODEC AVUTIL AVFORMAT AVFILTER SWSCALE SWRESAMPLE
obj.export_includes = ['..']
obj.uselib = """
AVCODEC AVUTIL AVFORMAT AVFILTER SWSCALE SWRESAMPLE
- BOOST_FILESYSTEM BOOST_THREAD BOOST_DATETIME BOOST_SIGNALS2
+ BOOST_FILESYSTEM BOOST_THREAD BOOST_DATETIME BOOST_SIGNALS2
SNDFILE OPENJPEG POSTPROC TIFF MAGICK SSH DCP CXML GLIB LZMA XML++
CURL ZIP QUICKMAIL
"""
SNDFILE OPENJPEG POSTPROC TIFF MAGICK SSH DCP CXML GLIB LZMA XML++
CURL ZIP QUICKMAIL
"""
+ if bld.env.TARGET_OSX:
+ obj.framework = ['IOKit', 'Foundation']
+
obj.source = sources + ' version.cc'
if bld.env.TARGET_WINDOWS:
obj.source = sources + ' version.cc'
if bld.env.TARGET_WINDOWS:
- obj.uselib += ' WINSOCK2 BFD DBGHELP IBERTY SHLWAPI MSWSOCK'
+ obj.uselib += ' WINSOCK2 BFD DBGHELP IBERTY SHLWAPI MSWSOCK
BOOST_LOCALE
'
obj.source += ' stack.cpp'
obj.source += ' stack.cpp'
- if bld.env.STATIC:
+ if bld.env.
BUILD_
STATIC:
obj.uselib += ' XML++'
obj.target = 'dcpomatic'
obj.uselib += ' XML++'
obj.target = 'dcpomatic'