Merge master.

[dcpomatic.git] / src / lib / wscript

diff --git a/src/lib/wscript b/src/lib/wscript
index 5510d48a8a577d6529a620341df4d22c5cc5c4f7..e53ac5a840d705381fafa16955a592f9cc68ff1a 100644 (file)
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -8,6 +8,7 @@ sources = """
           audio_analysis.cc
           audio_content.cc
           audio_decoder.cc
+          audio_mapping.cc
           audio_source.cc
           config.cc
           combiner.cc
@@ -17,7 +18,6 @@ sources = """
           dcp_content_type.cc
           dcp_video_frame.cc
           decoder.cc
-          decoder_factory.cc
           delay_line.cc
           dolby_cp750.cc
           encoder.cc
@@ -39,6 +39,7 @@ sources = """
           log.cc
           lut.cc
           matcher.cc
+          player.cc
           playlist.cc
           scp_dcp_job.cc
           scaler.cc
@@ -50,9 +51,10 @@ sources = """
           timer.cc
           transcode_job.cc
           transcoder.cc
+          types.cc
+          trimmer.cc
           ui_signaller.cc
           util.cc
-          version.cc
           video_content.cc
           video_decoder.cc
           video_source.cc
@@ -65,22 +67,24 @@ def build(bld):
     else:
         obj = bld(features = 'cxx cxxshlib')
 
-    obj.name = 'libdvdomatic'
+    obj.name = 'libdcpomatic'
     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 GLIB LZMA
+                 SNDFILE OPENJPEG POSTPROC TIFF MAGICK SSH DCP CXML GLIB LZMA
                  """
     if bld.env.TARGET_WINDOWS:
         obj.uselib += ' WINSOCK2'
-    obj.source = sources
-    obj.target = 'dvdomatic'
+    if bld.env.STATIC:
+        obj.uselib += ' XML++'
+    obj.source = sources + " version.cc"
+    obj.target = 'dcpomatic'
 
-    i18n.po_to_mo(os.path.join('src', 'lib'), 'libdvdomatic', bld)
+    i18n.po_to_mo(os.path.join('src', 'lib'), 'libdcpomatic', bld)
 
 def pot(bld):
-    i18n.pot(os.path.join('src', 'lib'), sources, 'libdvdomatic')
+    i18n.pot(os.path.join('src', 'lib'), sources, 'libdcpomatic')
 
 def pot_merge(bld):
-    i18n.pot_merge(os.path.join('src', 'lib'), 'libdvdomatic')
+    i18n.pot_merge(os.path.join('src', 'lib'), 'libdcpomatic')