Move audio into Encoder so that J2KStillEncoder can use it too. Rename J2KWAVEncoder...

[dcpomatic.git] / src / lib / wscript

diff --git a/src/lib/wscript b/src/lib/wscript
index 942975b32fd8006e2125b437fbebed9daaa61f0e..d13de4f3ba62fc3eccde160022543dff027cd109 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'
@@ -33,9 +37,8 @@ def build(bld):
                  gain.cc
                  image.cc
                  imagemagick_decoder.cc
-                 imagemagick_encoder.cc
                 j2k_still_encoder.cc
-                j2k_wav_encoder.cc
+                j2k_video_encoder.cc
                 job.cc
                 job_manager.cc
                 log.cc
@@ -44,7 +47,6 @@ def build(bld):
                  matcher.cc
                  scp_dcp_job.cc
                 scaler.cc
-                 screen.cc
                 server.cc
                  sound_processor.cc
                  stream.cc
@@ -59,7 +61,4 @@ def build(bld):
                  video_source.cc
                 """
 
-    if not bld.env.DISABLE_PLAYER:
-        obj.source += " player.cc player_manager.cc"
-
     obj.target = 'dvdomatic'