X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fwscript;h=0d3f2913c79d04dbcd1af03bbe2801edfb94275e;hb=59404039618db5d70a2f8fc0cb8c49ae4f8ce527;hp=d8cc8261d386bf0f06482b0bd71082312f22762b;hpb=237a0052c60af768f4d62b00321932918b7ba4d9;p=dcpomatic.git

diff --git a/src/lib/wscript b/src/lib/wscript
index d8cc8261d..0d3f2913c 100644
--- 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,28 +20,31 @@ 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
           sndfile_content.cc
           sndfile_decoder.cc
           sound_processor.cc
-          subtitle.cc
+          subtitle_content.cc
+          subtitle_decoder.cc
           timer.cc
           transcode_job.cc
           transcoder.cc
@@ -54,7 +53,6 @@ sources = """
           util.cc
           video_content.cc
           video_decoder.cc
-          video_source.cc
           writer.cc
           """
 
@@ -65,21 +63,21 @@ def build(bld):
         obj = bld(features = 'cxx cxxshlib')
 
     obj.name = 'libdcpomatic'
-    obj.export_includes = ['.']
+    obj.export_includes = ['..']
     obj.uselib = """
                  AVCODEC AVUTIL AVFORMAT AVFILTER SWSCALE SWRESAMPLE 
                  BOOST_FILESYSTEM BOOST_THREAD BOOST_DATETIME BOOST_SIGNALS2 
-                 SNDFILE OPENJPEG POSTPROC TIFF MAGICK SSH DCP CXML GLIB LZMA
+                 SNDFILE OPENJPEG POSTPROC TIFF MAGICK SSH DCP CXML GLIB LZMA XML++
                  """
 
     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++'
-    obj.source = sources + " version.cc"
+
     obj.target = 'dcpomatic'
 
     i18n.po_to_mo(os.path.join('src', 'lib'), 'libdcpomatic', bld)