X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fwscript;h=454565cdc447d55c386e64773c5ea48779fee939;hb=b1873c51b2e8265a01a8f0eced7fc3465f1677dc;hp=6d006f559cc5b578343a0a56f5b7df9ef3d7413f;hpb=967dc3f4461d4b8caf809ebce7bdcb6e818809f0;p=dcpomatic.git

diff --git a/src/lib/wscript b/src/lib/wscript
index 6d006f559..454565cdc 100644
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -1,28 +1,32 @@
 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'
+    obj.uselib = 'AVCODEC AVUTIL AVFORMAT AVFILTER SWSCALE SWRESAMPLE SNDFILE BOOST_FILESYSTEM BOOST_THREAD BOOST_DATETIME BOOST_SIGNALS2 OPENJPEG POSTPROC TIFF MAGICK SSH DCP GLIB LZMA'
     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
-		 copy_from_dvd_job.cc
+                 combiner.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
-                 dvd.cc
 		 encoder.cc
-                 encoder_factory.cc
 		 examine_content_job.cc
+		 external_audio_decoder.cc
                  filter_graph.cc
                  ffmpeg_compatibility.cc
                  ffmpeg_decoder.cc
@@ -32,18 +36,13 @@ def build(bld):
                  gain.cc
                  image.cc
                  imagemagick_decoder.cc
-                 imagemagick_encoder.cc
-		 j2k_still_encoder.cc
-		 j2k_wav_encoder.cc
 		 job.cc
 		 job_manager.cc
 		 log.cc
 		 lut.cc
-		 make_dcp_job.cc
                  matcher.cc
                  scp_dcp_job.cc
 		 scaler.cc
-                 screen.cc
 		 server.cc
                  sound_processor.cc
                  stream.cc
@@ -54,10 +53,9 @@ def build(bld):
                  ui_signaller.cc
 		 util.cc
 		 version.cc
+                 video_decoder.cc
                  video_source.cc
+                 writer.cc
 		 """
 
-    if not bld.env.DISABLE_PLAYER:
-        obj.source += " player.cc player_manager.cc"
-
     obj.target = 'dvdomatic'