Merge branch '1.0' of ssh://carlh.dnsalias.org/home/carl/git/dvdomatic into 1.0

[dcpomatic.git] / src / lib / wscript

diff --git a/src/lib/wscript b/src/lib/wscript
index 789db1551354693f7477500ebedb459519a58628..100663b8742251e04c5a4999626692d9255b95cf 100644 (file)
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -10,6 +10,7 @@ sources = """
           audio_mapping.cc
           config.cc
           content.cc
+          content_factory.cc
           cross.cc
           dci_metadata.cc
           dcp_content_type.cc
@@ -27,13 +28,12 @@ sources = """
           film.cc
           filter.cc
           image.cc
-          imagemagick_content.cc
-          imagemagick_decoder.cc
-          imagemagick_examiner.cc
+          still_image_content.cc
+          still_image_decoder.cc
+          still_image_examiner.cc
           job.cc
           job_manager.cc
           log.cc
-          lut.cc
           player.cc
           playlist.cc
           ratio.cc
@@ -44,7 +44,6 @@ sources = """
           sndfile_content.cc
           sndfile_decoder.cc
           sound_processor.cc
-          subtitle.cc
           subtitle_content.cc
           subtitle_decoder.cc
           timer.cc
@@ -65,11 +64,11 @@ def build(bld):
         obj = bld(features = 'cxx cxxshlib')
 
     obj.name = 'libdcpomatic'
-    obj.export_includes = ['.']
+    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
+                 SNDFILE OPENJPEG POSTPROC TIFF MAGICK SSH DCP CXML GLIB LZMA XML++
                  """
 
     obj.source = sources + ' version.cc'
@@ -79,7 +78,7 @@ def build(bld):
         obj.source += ' stack.cpp'
     if bld.env.STATIC:
         obj.uselib += ' XML++'
-    obj.source = sources + " version.cc"
+
     obj.target = 'dcpomatic'
 
     i18n.po_to_mo(os.path.join('src', 'lib'), 'libdcpomatic', bld)