summaryrefslogtreecommitdiff
path: root/wscript
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-12-16 01:01:30 +0000
committerCarl Hetherington <cth@carlh.net>2014-12-16 01:01:30 +0000
commit472fd9d8b5df5ceb76241be1e14bd8b6bd1f5692 (patch)
tree65837d3c7818301f4586c453deec317af1d16072 /wscript
parent3b88b77d5109d669ed2eb8597ead7ab0e40562e0 (diff)
More build fixes.
Diffstat (limited to 'wscript')
-rw-r--r--wscript6
1 files changed, 3 insertions, 3 deletions
diff --git a/wscript b/wscript
index 8402662..89716a2 100644
--- a/wscript
+++ b/wscript
@@ -31,10 +31,10 @@ def configure(conf):
conf.env.LIB_CXML = ['glibmm-2.4', 'glib-2.0', 'pcre', 'sigc-2.0', 'rt', 'xml++-2.6', 'xml2', 'pthread', 'lzma', 'dl', 'z']
conf.env.STLIB_CXML = ['cxml']
conf.check_cfg(package='libcxml', atleast_version='0.08', args='--cflags', uselib_store='CXML', mandatory=True)
- conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP]
- conf.env.STLIB_DCP = ['dcp', 'asdcp-libdcp', 'kumu-libdcp']
- conf.env.LIB_DCP = ['glibmm-2.4', 'ssl', 'crypto', 'bz2', 'xslt']
+ conf.env.STLIB_DCP = ['dcp', 'asdcp-libdcp', 'kumu-libdcp', 'openjpeg']
+ conf.env.LIB_DCP = ['glibmm-2.4', 'ssl', 'crypto', 'bz2', 'xslt', 'xmlsec1']
conf.check_cfg(package='libdcp', atleast_version='0.98', args='--cflags', uselib_store='DCP', mandatory=True)
+ conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP]
else:
conf.check_cfg(package='libcxml', atleast_version='0.08', args='--cflags --libs', uselib_store='CXML', mandatory=True)
conf.check_cfg(package='libdcp', atleast_version='0.97.0', args='--cflags --libs', uselib_store='DCP', mandatory=True)