projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix problems with FFmpeg files that have all-zero stream IDs.
[dcpomatic.git]
/
src
/
lib
/
wscript
diff --git
a/src/lib/wscript
b/src/lib/wscript
index 6c45d8b1ed3cdf5d4731f444385b9e6a8f733400..1699c5ec8c6b5c1b9f782a3cf718dfcbdca8049e 100644
(file)
--- a/
src/lib/wscript
+++ b/
src/lib/wscript
@@
-8,6
+8,7
@@
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
colour_conversion.cc
config.cc
content.cc
@@
-21,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
@@
-29,12
+31,13
@@
sources = """
film.cc
filter.cc
image.cc
film.cc
filter.cc
image.cc
+ image_content.cc
+ image_decoder.cc
+ image_examiner.cc
job.cc
job_manager.cc
job.cc
job_manager.cc
+ kdm.cc
log.cc
log.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
@@
-42,12
+45,10
@@
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
- still_image_content.cc
- still_image_decoder.cc
- still_image_examiner.cc
subtitle_content.cc
subtitle_decoder.cc
timer.cc
subtitle_content.cc
subtitle_decoder.cc
timer.cc
@@
-71,14
+72,15
@@
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++
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 BOOST_LOCALE
'
obj.source += ' stack.cpp'
if bld.env.STATIC:
obj.uselib += ' XML++'
obj.source += ' stack.cpp'
if bld.env.STATIC:
obj.uselib += ' XML++'