Rename some stuff Content -> Asset.

[libdcp.git] / src / wscript

diff --git a/src/wscript b/src/wscript
index 4b08da49d591ca85bae969ad6b856c4b35390723..54f3a03b4df0cee6d82408809488e501c72e6513 100644 (file)
--- a/src/wscript
+++ b/src/wscript
@@ -2,13 +2,11 @@ from waflib import TaskGen
 
 def build(bld):
     source = """
-             argb_frame.cc
              asset.cc
              certificate_chain.cc
              certificates.cc
              colour_conversion.cc
              colour_matrix.cc
-             content.cc
              cpl.cc
              dcp.cc        
              dcp_time.cc
@@ -18,10 +16,10 @@ def build(bld):
              exceptions.cc
              file.cc
              font.cc
+             font_node.cc
              gamma_transfer_function.cc
-             image.cc
-             interop_load_font.cc
-             interop_subtitle_content.cc
+             interop_load_font_node.cc
+             interop_subtitle_asset.cc
              key.cc
              local_time.cc
              metadata.cc
@@ -44,44 +42,45 @@ def build(bld):
              reel_subtitle_asset.cc
              rgb_xyz.cc
              signer.cc
-             smpte_load_font.cc
-             smpte_subtitle_content.cc
+             smpte_load_font_node.cc
+             smpte_subtitle_asset.cc
              sound_mxf.cc
              sound_mxf_writer.cc
              sound_frame.cc
              stereo_picture_mxf.cc
              stereo_picture_mxf_writer.cc
              stereo_picture_frame.cc
-             subtitle.cc
-             subtitle_content.cc
+             subtitle_node.cc
+             subtitle_asset.cc
              subtitle_string.cc
-             text.cc
+             text_node.cc
              transfer_function.cc
              types.cc
              util.cc
              version.cc
-             xyz_frame.cc
+             xyz_image.cc
              """
 
     headers = """
               asset.h
               certificate_chain.h
               certificates.h
+              chromaticity.h
               colour_conversion.h
               colour_matrix.h
               cpl.h
-              content.h
               dcp.h
               dcp_time.h
               decrypted_kdm.h
               decrypted_kdm_key.h
               encrypted_kdm.h
               exceptions.h
+              font.h
               gamma_transfer_function.h
-              image.h
-              interop_load_font.h
-              interop_subtitle_content.h
+              interop_load_font_node.h
+              interop_subtitle_asset.h
               key.h
+              load_font_node.h
               local_time.h
               metadata.h
               mono_picture_mxf.h
@@ -103,23 +102,22 @@ def build(bld):
               reel_stereo_picture_asset.h
               reel_subtitle_asset.h
               ref.h
-              argb_frame.h
               signer.h
-              smpte_load_font.h
-              smpte_subtitle_content.h
+              smpte_load_font_node.h
+              smpte_subtitle_asset.h
               sound_frame.h
               sound_mxf.h
               sound_mxf_writer.h
               stereo_picture_mxf.h
               stereo_picture_frame.h
-              subtitle.h
-              subtitle_content.h
+              subtitle_node.h
+              subtitle_asset.h
               subtitle_string.h
               transfer_function.h
               types.h
               util.h
               version.h
-              xyz_frame.h
+              xyz_image.h
               """
 
     # Main library
@@ -143,7 +141,7 @@ def build(bld):
         obj.uselib = 'BOOST_FILESYSTEM BOOST_SIGNALS2 BOOST_DATETIME OPENSSL SIGC++ LIBXML++ OPENJPEG CXML XMLSEC1'
         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']
+        obj.cppflags = ['-fprofile-arcs', '-ftest-coverage', '-fno-inline', '-fno-default-inline', '-fno-elide-constructors', '-g', '-O0']
 
     bld.install_files('${PREFIX}/include/libdcp%s/dcp' % bld.env.API_VERSION, headers)
     if bld.env.STATIC: