Adapt for changes in parent branch, and test churn.

[libdcp.git] / src / wscript

diff --git a/src/wscript b/src/wscript
index 4b39a979dd1cd19774b08edaaefb8ab1bc0fdd08..38aa784c6cb7da31a9d753a6efc0cd5dd0571d97 100644 (file)
--- a/src/wscript
+++ b/src/wscript
@@ -1,5 +1,5 @@
 #
-#    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+#    Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
@@ -39,10 +39,12 @@ def build(bld):
              asset_writer.cc
              atmos_asset.cc
              atmos_asset_writer.cc
+             bitstream.cc
              certificate_chain.cc
              certificate.cc
              chromaticity.cc
              colour_conversion.cc
+             combine.cc
              cpl.cc
              data.cc
              dcp.cc
@@ -53,12 +55,14 @@ def build(bld):
              exceptions.cc
              file.cc
              font_asset.cc
+             fsk.cc
              gamma_transfer_function.cc
              identity_transfer_function.cc
              interop_load_font_node.cc
              interop_subtitle_asset.cc
              j2k.cc
              key.cc
+             language_tag.cc
              local_time.cc
              locale_convert.cc
              metadata.cc
@@ -120,6 +124,8 @@ def build(bld):
               certificate.h
               chromaticity.h
               colour_conversion.h
+              combine.h
+              compose.hpp
               cpl.h
               crypto_context.h
               dcp.h
@@ -132,12 +138,14 @@ def build(bld):
               exceptions.h
               font_asset.h
               frame.h
+              fsk.h
               gamma_transfer_function.h
               identity_transfer_function.h
               interop_load_font_node.h
               interop_subtitle_asset.h
               j2k.h
               key.h
+              language_tag.h
               load_font_node.h
               local_time.h
               locale_convert.h
@@ -159,6 +167,7 @@ def build(bld):
               reel_asset.h
               reel_atmos_asset.h
               reel_closed_caption_asset.h
+              reel_markers_asset.h
               reel_mono_picture_asset.h
               reel_mxf.h
               reel_picture_asset.h
@@ -196,7 +205,7 @@ def build(bld):
     obj.name = 'libdcp%s' % bld.env.API_VERSION
     obj.target = 'dcp%s' % bld.env.API_VERSION
     obj.export_includes = ['.']
-    obj.uselib = 'BOOST_FILESYSTEM BOOST_SIGNALS2 BOOST_DATETIME OPENSSL SIGC++ LIBXML++ OPENJPEG CXML XMLSEC1 ASDCPLIB_CTH'
+    obj.uselib = 'BOOST_FILESYSTEM BOOST_SIGNALS2 BOOST_DATETIME OPENSSL SIGC++ LIBXML++ OPENJPEG CXML XMLSEC1 ASDCPLIB_CTH XERCES'
     obj.source = source
 
     # Library for gcov
@@ -208,7 +217,7 @@ def build(bld):
         obj.name = 'libdcp%s_gcov' % bld.env.API_VERSION
         obj.target = 'dcp%s_gcov' % bld.env.API_VERSION
         obj.export_includes = ['.']
-        obj.uselib = 'BOOST_FILESYSTEM BOOST_SIGNALS2 BOOST_DATETIME OPENSSL SIGC++ LIBXML++ OPENJPEG CXML XMLSEC1 ASDCPLIB_CTH'
+        obj.uselib = 'BOOST_FILESYSTEM BOOST_SIGNALS2 BOOST_DATETIME OPENSSL SIGC++ LIBXML++ OPENJPEG CXML XMLSEC1 ASDCPLIB_CTH XERCES'
         obj.use = 'libkumu-libdcp%s libasdcp-libdcp%s' % (bld.env.API_VERSION, bld.env.API_VERSION)
         obj.source = source
         obj.cppflags = ['-fprofile-arcs', '-ftest-coverage', '-fno-inline', '-fno-default-inline', '-fno-elide-constructors', '-g', '-O0']