Fix merge.

[dcpomatic.git] / src / lib / wscript

diff --git a/src/lib/wscript b/src/lib/wscript
index 6d006f559cc5b578343a0a56f5b7df9ef3d7413f..c1786bb818b6566ee85b0c4cddff299cfd5f543a 100644 (file)
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -1,5 +1,9 @@
 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.uselib = 'AVCODEC AVUTIL AVFORMAT AVFILTER SWSCALE SWRESAMPLE SNDFILE BOOST_FILESYSTEM BOOST_THREAD BOOST_DATETIME BOOST_SIGNALS2 OPENJPEG POSTPROC TIFF MAGICK SSH DCP GLIB'
@@ -8,10 +12,11 @@ def build(bld):
     obj.source = """
                 ab_transcode_job.cc
                 ab_transcoder.cc
+                 audio_decoder.cc
                  audio_source.cc
                  check_hashes_job.cc
                 config.cc
-                copy_from_dvd_job.cc
+                 combiner.cc
                  cross.cc
                 dcp_content_type.cc
                 dcp_video_frame.cc
@@ -19,10 +24,10 @@ def build(bld):
                  decoder_factory.cc
                  delay_line.cc
                  dolby_cp750.cc
-                 dvd.cc
                 encoder.cc
                  encoder_factory.cc
                 examine_content_job.cc
+                external_audio_decoder.cc
                  filter_graph.cc
                  ffmpeg_compatibility.cc
                  ffmpeg_decoder.cc
@@ -43,7 +48,6 @@ def build(bld):
                  matcher.cc
                  scp_dcp_job.cc
                 scaler.cc
-                 screen.cc
                 server.cc
                  sound_processor.cc
                  stream.cc
@@ -54,10 +58,8 @@ def build(bld):
                  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'