diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-06-18 15:07:41 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-06-18 15:07:41 +0100 |
| commit | c2bac22380bea453665a24c6f39200a977771daf (patch) | |
| tree | a464d94724318b81484eb3011fa0a946205550c3 /src/wscript | |
| parent | 564f68cb2c258e61c1e70950c9d036859ea8619a (diff) | |
| parent | 59617eb2230e47b59882c4f9ca6092ce05f53cf1 (diff) | |
Merge master.
Diffstat (limited to 'src/wscript')
| -rw-r--r-- | src/wscript | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/wscript b/src/wscript index 0922cb56..93d6d5c1 100644 --- a/src/wscript +++ b/src/wscript @@ -1,5 +1,5 @@ def build(bld): - if bld.env.STATIC_LIBDCP: + if bld.env.STATIC: obj = bld(features = 'cxx cxxstlib') else: obj = bld(features = 'cxx cxxshlib') @@ -7,37 +7,38 @@ def build(bld): obj.name = 'libdcp' obj.target = 'dcp' obj.export_includes = ['.'] - obj.uselib = 'BOOST_FILESYSTEM BOOST_SIGNALS2 BOOST_DATETIME OPENSSL SIGC++ LIBXML++ OPENJPEG XMLSEC1' + obj.uselib = 'BOOST_FILESYSTEM BOOST_SIGNALS2 BOOST_DATETIME OPENSSL SIGC++ LIBXML++ OPENJPEG CXML XMLSEC1' obj.use = 'libkumu-libdcp libasdcp-libdcp' obj.source = """ asset.cc - asset_map.cc + dcp.cc certificates.cc - cpl_file.cc crypt_chain.cc - dcp.cc + cpl.cc dcp_time.cc - lut.cc + gamma_lut.cc metadata.cc mxf_asset.cc picture_asset.cc picture_frame.cc - pkl_file.cc reel.cc argb_frame.cc sound_asset.cc sound_frame.cc subtitle_asset.cc - test_mode.cc types.cc util.cc version.cc - xml.cc + parse/asset_map.cc + parse/cpl.cc + parse/pkl.cc + parse/subtitle.cc """ headers = """ asset.h certificates.h + cpl.h crypt_chain.h dcp.h dcp_time.h @@ -51,13 +52,12 @@ def build(bld): 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: + if bld.env.STATIC: bld.install_files('${PREFIX}/lib', 'libdcp.a') + |