X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwscript;h=a76ca6a145a415b28b07a1984b619389b8f5002b;hb=926aff7db1e5ad6c02743608e3792fdca39eea4a;hp=f9f769db3c8e66159569174e2c53dc4a323d5ef2;hpb=d927e9b913606f4fc982885c7582ecaf0e3c5a1a;p=libdcp.git

diff --git a/src/wscript b/src/wscript
index f9f769db..a76ca6a1 100644
--- a/src/wscript
+++ b/src/wscript
@@ -35,44 +35,49 @@ 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
              dcp_time.cc
              decrypted_kdm.cc
+             decryption_context.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
              key.cc
              local_time.cc
+             locale_convert.cc
              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
+             name_format.cc
              object.cc
              openjpeg_image.cc
              picture_asset.cc
              picture_asset_writer.cc
+             raw_convert.cc
              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
@@ -81,20 +86,18 @@ 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_asset.cc
+             subtitle_asset_internal.cc
              subtitle_string.cc
-             text_node.cc
              transfer_function.cc
              types.cc
              util.cc
@@ -106,33 +109,42 @@ 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
               dcp.h
+              dcp_assert.h
               dcp_time.h
               data.h
               decrypted_kdm.h
               decrypted_kdm_key.h
+              decryption_context.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
               key.h
               load_font_node.h
               local_time.h
+              locale_convert.h
               metadata.h
               mono_picture_asset.h
               mono_picture_asset_reader.h
               mono_picture_frame.h
               modified_gamma_transfer_function.h
               mxf.h
+              name_format.h
               object.h
               openjpeg_image.h
               picture_asset.h
@@ -142,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
@@ -149,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
@@ -159,7 +173,6 @@ def build(bld):
               stereo_picture_asset_reader.h
               stereo_picture_asset_writer.h
               stereo_picture_frame.h
-              subtitle_node.h
               subtitle_asset.h
               subtitle_string.h
               transfer_function.h
@@ -177,7 +190,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