projects
/
libdcp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[libdcp.git]
/
src
/
wscript
diff --git
a/src/wscript
b/src/wscript
index 0922cb56c7de682ddd37344631505fc87d55eef5..93d6d5c1cef519a2b8ebcebc9d9ead5a8b44ad8d 100644
(file)
--- a/
src/wscript
+++ b/
src/wscript
@@
-1,5
+1,5
@@
def build(bld):
def build(bld):
- if bld.env.STATIC
_LIBDCP
:
+ if bld.env.STATIC:
obj = bld(features = 'cxx cxxstlib')
else:
obj = bld(features = 'cxx cxxshlib')
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.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
obj.use = 'libkumu-libdcp libasdcp-libdcp'
obj.source = """
asset.cc
- asset_map.cc
+ dcp.cc
certificates.cc
certificates.cc
- cpl_file.cc
crypt_chain.cc
crypt_chain.cc
- dcp.cc
+ cpl.cc
dcp_time.cc
dcp_time.cc
- lut.cc
+
gamma_
lut.cc
metadata.cc
mxf_asset.cc
picture_asset.cc
picture_frame.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
reel.cc
argb_frame.cc
sound_asset.cc
sound_frame.cc
subtitle_asset.cc
- test_mode.cc
types.cc
util.cc
version.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
"""
headers = """
asset.h
certificates.h
+ cpl.h
crypt_chain.h
dcp.h
dcp_time.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
sound_asset.h
sound_frame.h
subtitle_asset.h
- test_mode.h
types.h
util.h
version.h
types.h
util.h
version.h
- xml.h
"""
bld.install_files('${PREFIX}/include/libdcp', headers)
"""
bld.install_files('${PREFIX}/include/libdcp', headers)
- if bld.env.STATIC
_LIBDCP
:
+ if bld.env.STATIC:
bld.install_files('${PREFIX}/lib', 'libdcp.a')
bld.install_files('${PREFIX}/lib', 'libdcp.a')
+