Merge master.

[dcpomatic.git] / src / lib / wscript

diff --git a/src/lib/wscript b/src/lib/wscript
index d96bb7f96c8eac8981f8ac74552a14c68686d20d..7d74d462ce90719b7c839525aeed9c19c1c88208 100644 (file)
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -7,8 +7,11 @@ sources = """
           audio_buffers.cc
           audio_content.cc
           audio_decoder.cc
+          audio_filter.cc
           audio_mapping.cc
+          audio_processor.cc
           cinema.cc
+          cinema_sound_processor.cc
           colour_conversion.cc
           config.cc
           content.cc
@@ -55,6 +58,7 @@ sources = """
           log.cc
           magick_image_proxy.cc
           md5_digester.cc
+          mid_side_decoder.cc
           player.cc
           player_video.cc
           playlist.cc
@@ -70,7 +74,6 @@ sources = """
           single_stream_audio_content.cc
           sndfile_content.cc
           sndfile_decoder.cc
-          sound_processor.cc
           subrip.cc
           subrip_content.cc
           subrip_decoder.cc
@@ -82,6 +85,7 @@ sources = """
           types.cc
           ui_signaller.cc
           update.cc
+          upmixer_a.cc
           util.cc
           video_content.cc
           video_decoder.cc
@@ -100,7 +104,7 @@ def build(bld):
                  AVCODEC AVUTIL AVFORMAT AVFILTER SWSCALE SWRESAMPLE 
                  BOOST_FILESYSTEM BOOST_THREAD BOOST_DATETIME BOOST_SIGNALS2
                  SNDFILE OPENJPEG POSTPROC TIFF MAGICK SSH DCP CXML GLIB LZMA XML++
-                 CURL ZIP QUICKMAIL PANGOMM CAIROMM
+                 CURL ZIP QUICKMAIL PANGOMM CAIROMM XMLSEC
                  """
 
     if bld.env.TARGET_OSX:
@@ -112,7 +116,7 @@ def build(bld):
         obj.uselib += ' WINSOCK2 BFD DBGHELP IBERTY SHLWAPI MSWSOCK BOOST_LOCALE'
         obj.source += ' stack.cpp'
     if bld.env.BUILD_STATIC:
-        obj.uselib += ' XML++'
+        obj.uselib += ' XMLPP'
 
     obj.target = 'dcpomatic'