Merge master.

[dcpomatic.git] / src / lib / wscript

diff --git a/src/lib/wscript b/src/lib/wscript
index 7d74d462ce90719b7c839525aeed9c19c1c88208..3f77a5cebb9707b0575a8e8c29c30878d2f5d5e5 100644 (file)
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -54,7 +54,6 @@ sources = """
           job.cc
           job_manager.cc
           kdm.cc
-          json_server.cc
           log.cc
           magick_image_proxy.cc
           md5_digester.cc
@@ -66,6 +65,7 @@ sources = """
           raw_image_proxy.cc
           render_subtitles.cc
           resampler.cc
+          safe_stringstream.cc
           scp_dcp_job.cc
           scaler.cc
           send_kdm_email_job.cc
@@ -88,6 +88,7 @@ sources = """
           upmixer_a.cc
           util.cc
           video_content.cc
+          video_content_scale.cc
           video_decoder.cc
           writer.cc
           """
@@ -98,7 +99,7 @@ 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 
@@ -118,9 +119,9 @@ def build(bld):
     if bld.env.BUILD_STATIC:
         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')