projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master and multifarious hackery.
[dcpomatic.git]
/
src
/
lib
/
wscript
diff --git
a/src/lib/wscript
b/src/lib/wscript
index 66207b1e4468f700729e69b412fecb28650483a9..54941df420aac8bc445f4805372711acf94a8dfe 100644
(file)
--- a/
src/lib/wscript
+++ b/
src/lib/wscript
@@
-6,47
+6,56
@@
sources = """
ab_transcoder.cc
analyse_audio_job.cc
audio_analysis.cc
ab_transcoder.cc
analyse_audio_job.cc
audio_analysis.cc
+ audio_buffers.cc
+ audio_content.cc
audio_decoder.cc
audio_decoder.cc
+ audio_mapping.cc
audio_source.cc
audio_source.cc
+ black_decoder.cc
config.cc
combiner.cc
config.cc
combiner.cc
+ container.cc
+ content.cc
cross.cc
dci_metadata.cc
dcp_content_type.cc
dcp_video_frame.cc
decoder.cc
cross.cc
dci_metadata.cc
dcp_content_type.cc
dcp_video_frame.cc
decoder.cc
- decoder_factory.cc
- delay_line.cc
dolby_cp750.cc
encoder.cc
examine_content_job.cc
exceptions.cc
filter_graph.cc
dolby_cp750.cc
encoder.cc
examine_content_job.cc
exceptions.cc
filter_graph.cc
+ ffmpeg_content.cc
ffmpeg_decoder.cc
film.cc
filter.cc
format.cc
ffmpeg_decoder.cc
film.cc
filter.cc
format.cc
- gain.cc
image.cc
image.cc
+ imagemagick_content.cc
imagemagick_decoder.cc
job.cc
job_manager.cc
log.cc
lut.cc
imagemagick_decoder.cc
job.cc
job_manager.cc
log.cc
lut.cc
- matcher.cc
+ null_content.cc
+ player.cc
+ playlist.cc
scp_dcp_job.cc
scaler.cc
server.cc
scp_dcp_job.cc
scaler.cc
server.cc
+ silence_decoder.cc
+ sndfile_content.cc
sndfile_decoder.cc
sound_processor.cc
sndfile_decoder.cc
sound_processor.cc
- stream.cc
subtitle.cc
timer.cc
transcode_job.cc
transcoder.cc
subtitle.cc
timer.cc
transcode_job.cc
transcoder.cc
- t
rimmer
.cc
+ t
ypes
.cc
ui_signaller.cc
util.cc
ui_signaller.cc
util.cc
+ video_content.cc
video_decoder.cc
video_source.cc
writer.cc
video_decoder.cc
video_source.cc
writer.cc
@@
-58,12
+67,12
@@
def build(bld):
else:
obj = bld(features = 'cxx cxxshlib')
else:
obj = bld(features = 'cxx cxxshlib')
- obj.name = 'libd
vd
omatic'
+ obj.name = 'libd
cp
omatic'
obj.export_includes = ['.']
obj.uselib = """
AVCODEC AVUTIL AVFORMAT AVFILTER SWSCALE SWRESAMPLE
BOOST_FILESYSTEM BOOST_THREAD BOOST_DATETIME BOOST_SIGNALS2
obj.export_includes = ['.']
obj.uselib = """
AVCODEC AVUTIL AVFORMAT AVFILTER SWSCALE SWRESAMPLE
BOOST_FILESYSTEM BOOST_THREAD BOOST_DATETIME BOOST_SIGNALS2
- SNDFILE OPENJPEG POSTPROC TIFF MAGICK SSH DCP GLIB LZMA
+ SNDFILE OPENJPEG POSTPROC TIFF MAGICK SSH DCP
CXML
GLIB LZMA
"""
obj.source = sources + ' version.cc'
"""
obj.source = sources + ' version.cc'
@@
-71,13
+80,15
@@
def build(bld):
if bld.env.TARGET_WINDOWS:
obj.uselib += ' WINSOCK2 BFD DBGHELP IBERTY'
obj.source += ' stack.cpp'
if bld.env.TARGET_WINDOWS:
obj.uselib += ' WINSOCK2 BFD DBGHELP IBERTY'
obj.source += ' stack.cpp'
+ if bld.env.STATIC:
+ obj.uselib += ' XML++'
+ obj.source = sources + " version.cc"
+ obj.target = 'dcpomatic'
- obj.target = 'dvdomatic'
-
- i18n.po_to_mo(os.path.join('src', 'lib'), 'libdvdomatic', bld)
+ i18n.po_to_mo(os.path.join('src', 'lib'), 'libdcpomatic', bld)
def pot(bld):
def pot(bld):
- i18n.pot(os.path.join('src', 'lib'), sources, 'libd
vd
omatic')
+ i18n.pot(os.path.join('src', 'lib'), sources, 'libd
cp
omatic')
def pot_merge(bld):
def pot_merge(bld):
- i18n.pot_merge(os.path.join('src', 'lib'), 'libd
vd
omatic')
+ i18n.pot_merge(os.path.join('src', 'lib'), 'libd
cp
omatic')