X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwscript;h=180b7b49f9da292d502b620763ffb934ea4498f8;hb=5eb0ff8f094517ab6d82751288a69c8fcea74eb1;hp=c6185790fd92389682968f9da3fb1294c2f5736e;hpb=a2374eb06a0f6d391d1d5ae04f50ce5e8076173a;p=libdcp.git

diff --git a/src/wscript b/src/wscript
index c6185790..180b7b49 100644
--- a/src/wscript
+++ b/src/wscript
@@ -15,16 +15,33 @@
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #
+#    In addition, as a special exception, the copyright holders give
+#    permission to link the code of portions of this program with the
+#    OpenSSL library under certain conditions as described in each
+#    individual source file, and distribute linked combinations
+#    including the two.
+#
+#    You must obey the GNU General Public License in all respects
+#    for all of the code used other than OpenSSL.  If you modify
+#    file(s) with this exception, you may extend this exception to your
+#    version of the file(s), but you are not obligated to do so.  If you
+#    do not wish to do so, delete this exception statement from your
+#    version.  If you delete this exception statement from all source
+#    files in the program, then also delete it here.
+#
 
 from waflib import TaskGen
 
 def build(bld):
     source = """
              asset.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
@@ -35,26 +52,31 @@ def build(bld):
              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_writer.cc
              mono_picture_frame.cc
              mxf.cc
-             asset_writer.cc
+             name_format.cc
              object.cc
              openjpeg_image.cc
              picture_asset.cc
              picture_asset_writer.cc
+             pkl.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
@@ -63,6 +85,7 @@ 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
@@ -71,25 +94,34 @@ def build(bld):
              stereo_picture_asset.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
              """
 
     headers = """
               asset.h
+              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
@@ -97,19 +129,23 @@ def build(bld):
               encrypted_kdm.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
-              asset_writer.h
+              name_format.h
               object.h
               openjpeg_image.h
               picture_asset.h
@@ -118,6 +154,8 @@ def build(bld):
               rgb_xyz.h
               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
@@ -125,19 +163,25 @@ 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
               sound_asset.h
+              sound_asset_reader.h
               sound_asset_writer.h
               stereo_picture_asset.h
+              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
               """
 
@@ -150,7 +194,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