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 e91666f7f31929dcc3a2abe579531029f9410718..433f50b3fdca4565902baf3b4b7e7246a59514d4 100644
(file)
--- a/
src/lib/wscript
+++ b/
src/lib/wscript
@@
-13,15
+13,18
@@
sources = """
config.cc
content.cc
content_factory.cc
config.cc
content.cc
content_factory.cc
+ content_subtitle.cc
cross.cc
dci_metadata.cc
dcp_content_type.cc
cross.cc
dci_metadata.cc
dcp_content_type.cc
+ dcp_video.cc
dcp_video_frame.cc
dcp_video_frame.cc
- d
ecoder
.cc
+ d
cpomatic_time
.cc
dolby_cp750.cc
encoder.cc
examine_content_job.cc
exceptions.cc
dolby_cp750.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,26
+32,33
@@
sources = """
ffmpeg_examiner.cc
film.cc
filter.cc
ffmpeg_examiner.cc
film.cc
filter.cc
+ frame_rate_change.cc
+ internet.cc
image.cc
image.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
- 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
@@
-56,6
+66,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
+74,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,16
+83,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++
SNDFILE OPENJPEG POSTPROC TIFF MAGICK SSH DCP CXML GLIB LZMA XML++
+ CURL ZIP QUICKMAIL PANGOMM CAIROMM
"""
"""
+ 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'