Merge master and multifarious hackery.

[dcpomatic.git] / src / lib / wscript

diff --git a/src/lib/wscript b/src/lib/wscript
index fddebe8e648180a2744631a80ed88b6cd891ed0a..54941df420aac8bc445f4805372711acf94a8dfe 100644 (file)
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -6,31 +6,31 @@ sources = """
          ab_transcoder.cc
           analyse_audio_job.cc
           audio_analysis.cc
+          audio_buffers.cc
           audio_content.cc
           audio_decoder.cc
           audio_mapping.cc
           audio_source.cc
+          black_decoder.cc
           config.cc
           combiner.cc
+          container.cc
           content.cc
           cross.cc
           dci_metadata.cc
           dcp_content_type.cc
           dcp_video_frame.cc
           decoder.cc
-          delay_line.cc
           dolby_cp750.cc
           encoder.cc
           examine_content_job.cc
           exceptions.cc
           filter_graph.cc
-          ffmpeg_compatibility.cc
           ffmpeg_content.cc
           ffmpeg_decoder.cc
           film.cc
           filter.cc
           format.cc
-          gain.cc
           image.cc
           imagemagick_content.cc
           imagemagick_decoder.cc
@@ -38,12 +38,13 @@ sources = """
           job_manager.cc
           log.cc
           lut.cc
-          matcher.cc
+          null_content.cc
           player.cc
           playlist.cc
           scp_dcp_job.cc
           scaler.cc
           server.cc
+          silence_decoder.cc
           sndfile_content.cc
           sndfile_decoder.cc
           sound_processor.cc
@@ -73,8 +74,12 @@ def build(bld):
                  BOOST_FILESYSTEM BOOST_THREAD BOOST_DATETIME BOOST_SIGNALS2 
                  SNDFILE OPENJPEG POSTPROC TIFF MAGICK SSH DCP CXML GLIB LZMA
                  """
+
+    obj.source = sources + ' version.cc'
+
     if bld.env.TARGET_WINDOWS:
-        obj.uselib += ' WINSOCK2'
+        obj.uselib += ' WINSOCK2 BFD DBGHELP IBERTY'
+        obj.source += ' stack.cpp'
     if bld.env.STATIC:
         obj.uselib += ' XML++'
     obj.source = sources + " version.cc"