X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwscript;h=d16e15fc32a3064786e33900fb5645c2fdee58ae;hb=2da55dbe6da21975612584365db17db2ae9935b8;hp=180b7b49f9da292d502b620763ffb934ea4498f8;hpb=2f6087e528c1a48fed0ac7166b1ff8704684c87a;p=libdcp.git

diff --git a/src/wscript b/src/wscript
index 180b7b49..d16e15fc 100644
--- a/src/wscript
+++ b/src/wscript
@@ -1,5 +1,5 @@
 #
-#    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+#    Copyright (C) 2012-2020 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
@@ -34,14 +34,20 @@ from waflib import TaskGen
 
 def build(bld):
     source = """
+             array_data.cc
              asset.cc
+             asset_map.cc
+             asset_factory.cc
              asset_writer.cc
              atmos_asset.cc
              atmos_asset_writer.cc
+             bitstream.cc
              certificate_chain.cc
              certificate.cc
              chromaticity.cc
              colour_conversion.cc
+             combine.cc
+             content_kind.cc
              cpl.cc
              data.cc
              dcp.cc
@@ -52,12 +58,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
+             j2k_transcode.cc
              key.cc
+             language_tag.cc
              local_time.cc
              locale_convert.cc
              metadata.cc
@@ -72,20 +80,27 @@ def build(bld):
              picture_asset.cc
              picture_asset_writer.cc
              pkl.cc
+             rating.cc
              raw_convert.cc
              reel.cc
              reel_asset.cc
              reel_atmos_asset.cc
              reel_closed_caption_asset.cc
+             reel_file_asset.cc
+             reel_interop_closed_caption_asset.cc
+             reel_interop_subtitle_asset.cc
              reel_mono_picture_asset.cc
-             reel_mxf.cc
              reel_picture_asset.cc
+             reel_markers_asset.cc
+             reel_smpte_closed_caption_asset.cc
+             reel_smpte_subtitle_asset.cc
              reel_sound_asset.cc
              reel_stereo_picture_asset.cc
              reel_subtitle_asset.cc
              ref.cc
              rgb_xyz.cc
              s_gamut3_transfer_function.cc
+             search.cc
              smpte_load_font_node.cc
              smpte_subtitle_asset.cc
              sound_asset.cc
@@ -98,16 +113,22 @@ def build(bld):
              subtitle_asset.cc
              subtitle_asset_internal.cc
              subtitle_image.cc
+             subtitle_standard.cc
              subtitle_string.cc
              transfer_function.cc
              types.cc
+             utc_offset.cc
              util.cc
              verify.cc
+             verify_j2k.cc
              version.cc
              """
 
     headers = """
+              array_data.h
               asset.h
+              asset_list.h
+              asset_map.h
               asset_reader.h
               asset_writer.h
               atmos_asset.h
@@ -118,30 +139,37 @@ def build(bld):
               certificate.h
               chromaticity.h
               colour_conversion.h
+              combine.h
+              compose.hpp
+              content_kind.h
               cpl.h
               crypto_context.h
+              data.h
               dcp.h
               dcp_assert.h
               dcp_time.h
-              data.h
               decrypted_kdm.h
               decrypted_kdm_key.h
               encrypted_kdm.h
               exceptions.h
+              file.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
+              j2k_transcode.h
               key.h
+              language_tag.h
               load_font_node.h
               local_time.h
               locale_convert.h
               metadata.h
               mono_picture_asset.h
               mono_picture_asset_reader.h
+              mono_picture_asset_writer.h
               mono_picture_frame.h
               modified_gamma_transfer_function.h
               mxf.h
@@ -150,20 +178,29 @@ def build(bld):
               openjpeg_image.h
               picture_asset.h
               picture_asset_writer.h
+              piecewise_lut.h
+              pkl.h
+              rating.h
               raw_convert.h
               rgb_xyz.h
               reel.h
               reel_asset.h
               reel_atmos_asset.h
               reel_closed_caption_asset.h
+              reel_file_asset.h
+              reel_interop_closed_caption_asset.h
+              reel_interop_subtitle_asset.h
+              reel_markers_asset.h
               reel_mono_picture_asset.h
-              reel_mxf.h
               reel_picture_asset.h
               reel_sound_asset.h
+              reel_smpte_closed_caption_asset.h
+              reel_smpte_subtitle_asset.h
               reel_stereo_picture_asset.h
               reel_subtitle_asset.h
               ref.h
               s_gamut3_transfer_function.h
+              search.h
               smpte_load_font_node.h
               smpte_subtitle_asset.h
               sound_frame.h
@@ -177,12 +214,16 @@ def build(bld):
               subtitle.h
               subtitle_asset.h
               subtitle_image.h
+              subtitle_standard.h
               subtitle_string.h
               transfer_function.h
               types.h
+              utc_offset.h
               util.h
               verify.h
+              verify_j2k.h
               version.h
+              warnings.h
               """
 
     # Main library
@@ -193,16 +234,19 @@ 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
     if bld.is_defined('HAVE_GCOV'):
-        obj = bld(features='cxx cxxstlib')
+        if bld.env.STATIC:
+            obj = bld(features='cxx cxxstlib')
+        else:
+            obj = bld(features='cxx cxxshlib')
         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']