Merge master.

[dcpomatic.git] / src / lib / wscript

diff --git a/src/lib/wscript b/src/lib/wscript
index d8cc8261d386bf0f06482b0bd71082312f22762b..2f86539841da3efade020391e8b9a97aeb8972a6 100644 (file)
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -2,17 +2,13 @@ import os
 import i18n
 
 sources = """
-          ab_transcode_job.cc
-         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
           config.cc
-          combiner.cc
           content.cc
           cross.cc
           dci_metadata.cc
@@ -24,21 +20,24 @@ sources = """
           examine_content_job.cc
           exceptions.cc
           filter_graph.cc
-          ffmpeg_compatibility.cc
+          ffmpeg.cc
           ffmpeg_content.cc
           ffmpeg_decoder.cc
+          ffmpeg_examiner.cc
           film.cc
           filter.cc
-          format.cc
           image.cc
           imagemagick_content.cc
           imagemagick_decoder.cc
+          imagemagick_examiner.cc
           job.cc
           job_manager.cc
           log.cc
           lut.cc
           player.cc
           playlist.cc
+          ratio.cc
+          resampler.cc
           scp_dcp_job.cc
           scaler.cc
           server.cc
@@ -54,7 +53,6 @@ sources = """
           util.cc
           video_content.cc
           video_decoder.cc
-          video_source.cc
           writer.cc
           """
 
@@ -75,7 +73,7 @@ def build(bld):
     obj.source = sources + ' version.cc'
 
     if bld.env.TARGET_WINDOWS:
-        obj.uselib += ' WINSOCK2 BFD DBGHELP IBERTY'
+        obj.uselib += ' WINSOCK2 BFD DBGHELP IBERTY SHLWAPI'
         obj.source += ' stack.cpp'
     if bld.env.STATIC:
         obj.uselib += ' XML++'