projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix nasty race in dcpomatic_create.
[dcpomatic.git]
/
src
/
lib
/
wscript
diff --git
a/src/lib/wscript
b/src/lib/wscript
index 2f1f7d325f990ec229e0624ee5816b20ad85a8fa..7c9712ff8f74c3f7f4b83144ac0bb69a3dd23839 100644
(file)
--- a/
src/lib/wscript
+++ b/
src/lib/wscript
@@
-8,8
+8,11
@@
sources = """
audio_content.cc
audio_decoder.cc
audio_mapping.cc
audio_content.cc
audio_decoder.cc
audio_mapping.cc
+ cinema.cc
+ colour_conversion.cc
config.cc
content.cc
config.cc
content.cc
+ content_factory.cc
cross.cc
dci_metadata.cc
dcp_content_type.cc
cross.cc
dci_metadata.cc
dcp_content_type.cc
@@
-19,6
+22,7
@@
sources = """
encoder.cc
examine_content_job.cc
exceptions.cc
encoder.cc
examine_content_job.cc
exceptions.cc
+ file_group.cc
filter_graph.cc
ffmpeg.cc
ffmpeg_content.cc
filter_graph.cc
ffmpeg.cc
ffmpeg_content.cc
@@
-27,20
+31,23
@@
sources = """
film.cc
filter.cc
image.cc
film.cc
filter.cc
image.cc
- image
magick
_content.cc
- image
magick
_decoder.cc
- image
magick
_examiner.cc
+ image_content.cc
+ image_decoder.cc
+ image_examiner.cc
job.cc
job_manager.cc
job.cc
job_manager.cc
+ kdm.cc
+ json_server.cc
log.cc
log.cc
- lut.cc
player.cc
playlist.cc
ratio.cc
resampler.cc
scp_dcp_job.cc
scaler.cc
player.cc
playlist.cc
ratio.cc
resampler.cc
scp_dcp_job.cc
scaler.cc
+ send_kdm_email_job.cc
server.cc
server.cc
+ server_finder.cc
sndfile_content.cc
sndfile_decoder.cc
sound_processor.cc
sndfile_content.cc
sndfile_decoder.cc
sound_processor.cc
@@
-51,6
+58,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
@@
-58,25
+66,29
@@
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.name = 'libdcpomatic'
obj = bld(features = 'cxx cxxstlib')
else:
obj = bld(features = 'cxx cxxshlib')
obj.name = 'libdcpomatic'
- obj.export_includes = ['.']
+ obj.export_includes = ['.
.
']
obj.uselib = """
AVCODEC AVUTIL AVFORMAT AVFILTER SWSCALE SWRESAMPLE
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++
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'
+ 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'