Merge branch 'master' of /home/carl/git/libdcp

[libdcp.git] / src / wscript

diff --git a/src/wscript b/src/wscript
index fb62970a9da9d1a9929c0f88d02ba45298f968b0..3960f2b0c54e8ccaba4830294e185d0210337a1f 100644 (file)
--- a/src/wscript
+++ b/src/wscript
@@ -1,23 +1,28 @@
 def build(bld):
-    obj = bld(features = 'cxx cxxshlib')
+    if bld.env.STATIC_LIBDCP:
+        obj = bld(features = 'cxx cxxstlib')
+    else:
+        obj = bld(features = 'cxx cxxshlib')
+
     obj.name = 'libdcp'
     obj.target = 'dcp'
     obj.export_includes = ['.']
-    obj.uselib = 'BOOST_FILESYSTEM OPENSSL SIGC++ LIBXML++ OPENJPEG'
+    obj.uselib = 'BOOST_FILESYSTEM BOOST_SIGNALS2 OPENSSL SIGC++ LIBXML++ OPENJPEG'
     obj.use = 'libkumu-libdcp libasdcp-libdcp'
     obj.source = """
                  asset.cc
                  asset_map.cc
-                 cpl.cc
+                 cpl_file.cc
                  dcp.cc        
                  dcp_time.cc
-                 lut.cc
+                 gamma_lut.cc
                  metadata.cc
                  mxf_asset.cc
                  picture_asset.cc
                  picture_frame.cc
-                 pkl.cc
-                 rgba_frame.cc
+                 pkl_file.cc
+                 reel.cc
+                 argb_frame.cc
                  sound_asset.cc
                  sound_frame.cc
                  subtitle_asset.cc
@@ -37,14 +42,18 @@ def build(bld):
               mxf_asset.h
               picture_asset.h
               picture_frame.h
-              rgba_frame.h
+              reel.h
+              argb_frame.h
               sound_asset.h
               sound_frame.h
               subtitle_asset.h
               test_mode.h
               types.h
+              util.h
               version.h
               xml.h
               """
 
     bld.install_files('${PREFIX}/include/libdcp', headers)
+    if bld.env.STATIC_LIBDCP:
+        bld.install_files('${PREFIX}/lib', 'libdcp.a')