projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix merge.
[dcpomatic.git]
/
src
/
lib
/
wscript
diff --git
a/src/lib/wscript
b/src/lib/wscript
index 4f1fa06364a3d9896576beee0ed5770082deb08d..c1786bb818b6566ee85b0c4cddff299cfd5f543a 100644
(file)
--- a/
src/lib/wscript
+++ b/
src/lib/wscript
@@
-1,16
+1,22
@@
def build(bld):
def build(bld):
- obj = bld(features = 'cxx cxxshlib')
+ if bld.env.STATIC:
+ obj = bld(features = 'cxx cxxstlib')
+ else:
+ obj = bld(features = 'cxx cxxshlib')
+
obj.name = 'libdvdomatic'
obj.export_includes = ['.']
obj.name = 'libdvdomatic'
obj.export_includes = ['.']
- obj.uselib = 'AVCODEC AVUTIL AVFORMAT AVFILTER SWSCALE SWRESAMPLE SNDFILE BOOST_FILESYSTEM BOOST_THREAD BOOST_DATETIME
OPENJPEG POSTPROC TIFF SIGC++
MAGICK SSH DCP GLIB'
+ obj.uselib = 'AVCODEC AVUTIL AVFORMAT AVFILTER SWSCALE SWRESAMPLE SNDFILE BOOST_FILESYSTEM BOOST_THREAD BOOST_DATETIME
BOOST_SIGNALS2 OPENJPEG POSTPROC TIFF
MAGICK SSH DCP GLIB'
if bld.env.TARGET_WINDOWS:
obj.uselib += ' WINSOCK2'
obj.source = """
ab_transcode_job.cc
ab_transcoder.cc
if bld.env.TARGET_WINDOWS:
obj.uselib += ' WINSOCK2'
obj.source = """
ab_transcode_job.cc
ab_transcoder.cc
+ audio_decoder.cc
+ audio_source.cc
check_hashes_job.cc
config.cc
check_hashes_job.cc
config.cc
-
copy_from_dvd_job
.cc
+
combiner
.cc
cross.cc
dcp_content_type.cc
dcp_video_frame.cc
cross.cc
dcp_content_type.cc
dcp_video_frame.cc
@@
-18,15
+24,17
@@
def build(bld):
decoder_factory.cc
delay_line.cc
dolby_cp750.cc
decoder_factory.cc
delay_line.cc
dolby_cp750.cc
- dvd.cc
encoder.cc
encoder_factory.cc
examine_content_job.cc
encoder.cc
encoder_factory.cc
examine_content_job.cc
+ external_audio_decoder.cc
+ filter_graph.cc
ffmpeg_compatibility.cc
ffmpeg_decoder.cc
film.cc
filter.cc
format.cc
ffmpeg_compatibility.cc
ffmpeg_decoder.cc
film.cc
filter.cc
format.cc
+ gain.cc
image.cc
imagemagick_decoder.cc
imagemagick_encoder.cc
image.cc
imagemagick_decoder.cc
imagemagick_encoder.cc
@@
-37,23
+45,21
@@
def build(bld):
log.cc
lut.cc
make_dcp_job.cc
log.cc
lut.cc
make_dcp_job.cc
+ matcher.cc
scp_dcp_job.cc
scaler.cc
scp_dcp_job.cc
scaler.cc
- screen.cc
server.cc
sound_processor.cc
stream.cc
subtitle.cc
server.cc
sound_processor.cc
stream.cc
subtitle.cc
- tiff_decoder.cc
timer.cc
transcode_job.cc
transcoder.cc
ui_signaller.cc
util.cc
version.cc
timer.cc
transcode_job.cc
transcoder.cc
ui_signaller.cc
util.cc
version.cc
+ video_decoder.cc
+ video_source.cc
"""
"""
- if not bld.env.DISABLE_PLAYER:
- obj.source += " player.cc player_manager.cc"
-
obj.target = 'dvdomatic'
obj.target = 'dvdomatic'