Remove libavformat-specific bit from FileGroup.

[dcpomatic.git] / src / lib / wscript

diff --git a/src/lib/wscript b/src/lib/wscript
index d0f10299821d95778631e943c8d4b2e57ef0a6e1..ebd316a0c174b88420d05b95fb64aeb432532587 100644 (file)
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -8,11 +8,11 @@ sources = """
           audio_content.cc
           audio_decoder.cc
           audio_mapping.cc
-          audio_source.cc
-          black_decoder.cc
+          cinema.cc
+          colour_conversion.cc
           config.cc
-          combiner.cc
           content.cc
+          content_factory.cc
           cross.cc
           dci_metadata.cc
           dcp_content_type.cc
@@ -22,6 +22,7 @@ sources = """
           encoder.cc
           examine_content_job.cc
           exceptions.cc
+          file_group.cc
           filter_graph.cc
           ffmpeg.cc
           ffmpeg_content.cc
@@ -30,25 +31,26 @@ sources = """
           film.cc
           filter.cc
           image.cc
-          imagemagick_content.cc
-          imagemagick_decoder.cc
-          imagemagick_examiner.cc
+          image_content.cc
+          image_decoder.cc
+          image_examiner.cc
           job.cc
           job_manager.cc
+          kdm.cc
           log.cc
-          lut.cc
-          null_content.cc
           player.cc
           playlist.cc
           ratio.cc
+          resampler.cc
           scp_dcp_job.cc
           scaler.cc
           server.cc
-          silence_decoder.cc
+          server_finder.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
@@ -57,7 +59,6 @@ sources = """
           util.cc
           video_content.cc
           video_decoder.cc
-          video_source.cc
           writer.cc
           """
 
@@ -68,21 +69,22 @@ 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++
+                 CURL ZIP QUICKMAIL
                  """
 
     obj.source = sources + ' version.cc'
 
     if bld.env.TARGET_WINDOWS:
-        obj.uselib += ' WINSOCK2 BFD DBGHELP IBERTY'
+        obj.uselib += ' WINSOCK2 BFD DBGHELP IBERTY SHLWAPI MSWSOCK'
         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)