Merge branch 'master' of ssh://git.carlh.net/home/carl/git/libdcp

[libdcp.git] / src / wscript

diff --git a/src/wscript b/src/wscript
index d76b1a5085eae557dbe47419140b8c2a90eed957..93415b4d090fce663b2beafdbcb36359ef5ab84e 100644 (file)
--- a/src/wscript
+++ b/src/wscript
@@ -35,13 +35,13 @@ from waflib import TaskGen
 def build(bld):
     source = """
              asset.cc
-             asset_reader.cc
              asset_writer.cc
              atmos_asset.cc
+             atmos_asset_writer.cc
              certificate_chain.cc
              certificate.cc
+             chromaticity.cc
              colour_conversion.cc
-             colour_matrix.cc
              cpl.cc
              data.cc
              dcp.cc
@@ -49,12 +49,11 @@ def build(bld):
              decrypted_kdm.cc
              decrypted_kdm_key.cc
              encrypted_kdm.cc
-             encryption_context.cc
              exceptions.cc
              file.cc
              font_asset.cc
-             font_node.cc
              gamma_transfer_function.cc
+             identity_transfer_function.cc
              interop_load_font_node.cc
              interop_subtitle_asset.cc
              j2k.cc
@@ -64,7 +63,6 @@ def build(bld):
              metadata.cc
              modified_gamma_transfer_function.cc
              mono_picture_asset.cc
-             mono_picture_asset_reader.cc
              mono_picture_asset_writer.cc
              mono_picture_frame.cc
              mxf.cc
@@ -77,6 +75,7 @@ def build(bld):
              reel.cc
              reel_asset.cc
              reel_atmos_asset.cc
+             reel_closed_caption_asset.cc
              reel_mono_picture_asset.cc
              reel_mxf.cc
              reel_picture_asset.cc
@@ -85,23 +84,24 @@ def build(bld):
              reel_subtitle_asset.cc
              ref.cc
              rgb_xyz.cc
+             s_gamut3_transfer_function.cc
              smpte_load_font_node.cc
              smpte_subtitle_asset.cc
              sound_asset.cc
-             sound_asset_reader.cc
              sound_asset_writer.cc
              sound_frame.cc
              stereo_picture_asset.cc
-             stereo_picture_asset_reader.cc
              stereo_picture_asset_writer.cc
              stereo_picture_frame.cc
-             subtitle_node.cc
+             subtitle.cc
              subtitle_asset.cc
+             subtitle_asset_internal.cc
+             subtitle_image.cc
              subtitle_string.cc
-             text_node.cc
              transfer_function.cc
              types.cc
              util.cc
+             verify.cc
              version.cc
              """
 
@@ -110,22 +110,27 @@ def build(bld):
               asset_reader.h
               asset_writer.h
               atmos_asset.h
+              atmos_asset_reader.h
+              atmos_asset_writer.h
+              atmos_frame.h
               certificate_chain.h
               certificate.h
               chromaticity.h
               colour_conversion.h
-              colour_matrix.h
               cpl.h
+              crypto_context.h
               dcp.h
+              dcp_assert.h
               dcp_time.h
               data.h
               decrypted_kdm.h
               decrypted_kdm_key.h
               encrypted_kdm.h
-              encryption_context.h
               exceptions.h
               font_asset.h
+              frame.h
               gamma_transfer_function.h
+              identity_transfer_function.h
               interop_load_font_node.h
               interop_subtitle_asset.h
               j2k.h
@@ -149,6 +154,7 @@ def build(bld):
               reel.h
               reel_asset.h
               reel_atmos_asset.h
+              reel_closed_caption_asset.h
               reel_mono_picture_asset.h
               reel_mxf.h
               reel_picture_asset.h
@@ -156,6 +162,7 @@ def build(bld):
               reel_stereo_picture_asset.h
               reel_subtitle_asset.h
               ref.h
+              s_gamut3_transfer_function.h
               smpte_load_font_node.h
               smpte_subtitle_asset.h
               sound_frame.h
@@ -166,12 +173,14 @@ def build(bld):
               stereo_picture_asset_reader.h
               stereo_picture_asset_writer.h
               stereo_picture_frame.h
-              subtitle_node.h
+              subtitle.h
               subtitle_asset.h
+              subtitle_image.h
               subtitle_string.h
               transfer_function.h
               types.h
               util.h
+              verify.h
               version.h
               """
 
@@ -184,7 +193,6 @@ def build(bld):
     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.use = 'libkumu-libdcp%s libasdcp-libdcp%s' % (bld.env.API_VERSION, bld.env.API_VERSION)
     obj.source = source
 
     # Library for gcov