Merge master.

[dcpomatic.git] / src / lib / wscript

diff --git a/src/lib/wscript b/src/lib/wscript
index 51b103afdc3e639fb357a8e09551551e6f3864b9..e53ac5a840d705381fafa16955a592f9cc68ff1a 100644 (file)
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -6,16 +6,18 @@ sources = """
          ab_transcoder.cc
           analyse_audio_job.cc
           audio_analysis.cc
+          audio_content.cc
           audio_decoder.cc
+          audio_mapping.cc
           audio_source.cc
           config.cc
           combiner.cc
+          content.cc
           cross.cc
           dci_metadata.cc
           dcp_content_type.cc
           dcp_video_frame.cc
           decoder.cc
-          decoder_factory.cc
           delay_line.cc
           dolby_cp750.cc
           encoder.cc
@@ -23,31 +25,37 @@ sources = """
           exceptions.cc
           filter_graph.cc
           ffmpeg_compatibility.cc
+          ffmpeg_content.cc
           ffmpeg_decoder.cc
           film.cc
           filter.cc
           format.cc
           gain.cc
           image.cc
+          imagemagick_content.cc
           imagemagick_decoder.cc
           job.cc
           job_manager.cc
           log.cc
           lut.cc
           matcher.cc
+          player.cc
+          playlist.cc
           scp_dcp_job.cc
           scaler.cc
           server.cc
+          sndfile_content.cc
           sndfile_decoder.cc
           sound_processor.cc
-          stream.cc
           subtitle.cc
           timer.cc
           transcode_job.cc
           transcoder.cc
+          types.cc
           trimmer.cc
           ui_signaller.cc
           util.cc
+          video_content.cc
           video_decoder.cc
           video_source.cc
           writer.cc
@@ -59,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'
+    if bld.env.STATIC:
+        obj.uselib += ' XML++'
     obj.source = sources + " version.cc"
-    obj.target = 'dvdomatic'
+    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')