projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
lib
/
wscript
diff --git
a/src/lib/wscript
b/src/lib/wscript
index f731795c760175b61354239ad5297410e38df0a2..a5b069184024ba981c09f8a2e4e65f26749af194 100644
(file)
--- a/
src/lib/wscript
+++ b/
src/lib/wscript
@@
-22,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
@@
-30,26
+31,29
@@
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
kdm.cc
log.cc
job.cc
job_manager.cc
kdm.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
+ render_subtitles.cc
resampler.cc
scp_dcp_job.cc
scaler.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
- s
till_image_content
.cc
- s
till_image_decoder
.cc
- s
till_image_examin
er.cc
+ s
ubrip
.cc
+ s
ubrip_content
.cc
+ s
ubrip_decod
er.cc
subtitle_content.cc
subtitle_decoder.cc
timer.cc
subtitle_content.cc
subtitle_decoder.cc
timer.cc
@@
-57,6
+61,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
@@
-64,7
+69,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')
@@
-73,17
+78,17
@@
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
+ CURL ZIP QUICKMAIL
PANGOMM CAIROMM
"""
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'