projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Stop strange things happening with zero-length video files.
[dcpomatic.git]
/
src
/
lib
/
wscript
diff --git
a/src/lib/wscript
b/src/lib/wscript
index 2f86539841da3efade020391e8b9a97aeb8972a6..852bb1aed57e60240b3b15adf0a578c5609b1f8b 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
@@
-27,13
+30,13
@@
sources = """
film.cc
filter.cc
image.cc
film.cc
filter.cc
image.cc
- imagemagick_content.cc
- imagemagick_decoder.cc
- imagemagick_examiner.cc
job.cc
job_manager.cc
job.cc
job_manager.cc
+ kdm.cc
log.cc
log.cc
- lut.cc
+ moving_image_content.cc
+ moving_image_decoder.cc
+ moving_image_examiner.cc
player.cc
playlist.cc
ratio.cc
player.cc
playlist.cc
ratio.cc
@@
-41,10
+44,15
@@
sources = """
scp_dcp_job.cc
scaler.cc
server.cc
scp_dcp_job.cc
scaler.cc
server.cc
+ server_finder.cc
sndfile_content.cc
sndfile_decoder.cc
sound_processor.cc
sndfile_content.cc
sndfile_decoder.cc
sound_processor.cc
- subtitle.cc
+ still_image_content.cc
+ still_image_decoder.cc
+ still_image_examiner.cc
+ subtitle_content.cc
+ subtitle_decoder.cc
timer.cc
transcode_job.cc
transcoder.cc
timer.cc
transcode_job.cc
transcoder.cc
@@
-63,21
+71,22
@@
def build(bld):
obj = bld(features = 'cxx cxxshlib')
obj.name = 'libdcpomatic'
obj = bld(features = 'cxx cxxshlib')
obj.name = 'libdcpomatic'
- obj.export_includes = ['.']
+ obj.export_includes = ['.
.
']
obj.uselib = """
AVCODEC AVUTIL AVFORMAT AVFILTER SWSCALE SWRESAMPLE
BOOST_FILESYSTEM BOOST_THREAD BOOST_DATETIME BOOST_SIGNALS2
obj.uselib = """
AVCODEC AVUTIL AVFORMAT AVFILTER SWSCALE SWRESAMPLE
BOOST_FILESYSTEM BOOST_THREAD BOOST_DATETIME BOOST_SIGNALS2
- SNDFILE OPENJPEG POSTPROC TIFF MAGICK SSH DCP CXML GLIB LZMA
+ SNDFILE OPENJPEG POSTPROC TIFF MAGICK SSH DCP CXML GLIB LZMA XML++
+ CURL ZIP QUICKMAIL
"""
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
'
obj.source += ' stack.cpp'
if bld.env.STATIC:
obj.uselib += ' XML++'
obj.source += ' stack.cpp'
if bld.env.STATIC:
obj.uselib += ' XML++'
- obj.source = sources + " version.cc"
+
obj.target = 'dcpomatic'
i18n.po_to_mo(os.path.join('src', 'lib'), 'libdcpomatic', bld)
obj.target = 'dcpomatic'
i18n.po_to_mo(os.path.join('src', 'lib'), 'libdcpomatic', bld)