Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0

[dcpomatic.git] / src / lib / wscript

diff --git a/src/lib/wscript b/src/lib/wscript
index 9c929a671c9cbe7bbe8a6cc7f42cb184b8284644..0a6b7920719fdbe6fe989eff5fe3269c46ebd2e3 100644 (file)
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -7,6 +7,7 @@ sources = """
           audio_buffers.cc
           audio_content.cc
           audio_decoder.cc
+          audio_filter.cc
           audio_mapping.cc
           audio_processor.cc
           cinema.cc
@@ -53,7 +54,6 @@ sources = """
           job.cc
           job_manager.cc
           kdm.cc
-          json_server.cc
           log.cc
           magick_image_proxy.cc
           md5_digester.cc
@@ -61,19 +61,22 @@ sources = """
           player.cc
           player_video.cc
           playlist.cc
+          position_image.cc
+          quickmail.cc
           ratio.cc
           raw_image_proxy.cc
           render_subtitles.cc
           resampler.cc
+          safe_stringstream.cc
           scp_dcp_job.cc
           scaler.cc
           send_kdm_email_job.cc
+          send_problem_report_job.cc
           server.cc
           server_finder.cc
           single_stream_audio_content.cc
           sndfile_content.cc
           sndfile_decoder.cc
-          sox_audio_processor.cc
           subrip.cc
           subrip_content.cc
           subrip_decoder.cc
@@ -85,8 +88,10 @@ sources = """
           types.cc
           ui_signaller.cc
           update.cc
+          upmixer_a.cc
           util.cc
           video_content.cc
+          video_content_scale.cc
           video_decoder.cc
           writer.cc
           """
@@ -97,13 +102,13 @@ def build(bld):
     else:
         obj = bld(features = 'cxx cxxshlib')
 
-    obj.name = 'libdcpomatic'
+    obj.name = 'libdcpomatic2'
     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 XML++
-                 CURL ZIP QUICKMAIL PANGOMM CAIROMM
+                 CURL ZIP PANGOMM CAIROMM XMLSEC SUB
                  """
 
     if bld.env.TARGET_OSX:
@@ -115,11 +120,11 @@ 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'
+    obj.target = 'dcpomatic2'
 
-    i18n.po_to_mo(os.path.join('src', 'lib'), 'libdcpomatic', bld)
+    i18n.po_to_mo(os.path.join('src', 'lib'), 'libdcpomatic2', bld)
 
 def pot(bld):
     i18n.pot(os.path.join('src', 'lib'), sources, 'libdcpomatic')