summaryrefslogtreecommitdiff
path: root/wscript
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-02-08 16:59:38 +0000
committerCarl Hetherington <cth@carlh.net>2014-02-08 16:59:38 +0000
commit3a39682d6a894c83a3646be7d104f77c71f64400 (patch)
treec2965d6bc097a5fa7852b236ab6df7e15911a51f /wscript
parenta81037803e637a8b592635b8b973aecdb67ca0ce (diff)
More windows build fixes.
Diffstat (limited to 'wscript')
-rw-r--r--wscript5
1 files changed, 5 insertions, 0 deletions
diff --git a/wscript b/wscript
index 425bfee20..8663f2caa 100644
--- a/wscript
+++ b/wscript
@@ -50,6 +50,10 @@ def static_openjpeg(conf):
conf.check_cfg(package='libopenjpeg', args='--cflags', max_version='1.5.1', mandatory=True)
conf.env.STLIB_OPENJPEG = ['openjpeg']
+def dynamic_openjpeg(conf):
+ conf.check_cfg(package='libopenjpeg', args='--cflags --libs', atleast_version='1.5.0', uselib_store='OPENJPEG', mandatory=True)
+ conf.check_cfg(package='libopenjpeg', args='--cflags --libs', max_version='1.5.1', mandatory=True)
+
def static_dcp(conf, static_boost, static_xmlpp, static_xmlsec, static_ssh):
conf.check_cfg(package='libdcp', atleast_version='0.92', args='--cflags', uselib_store='DCP', mandatory=True)
conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP]
@@ -274,6 +278,7 @@ def configure(conf):
dynamic_quickmail(conf)
dynamic_boost(conf, boost_lib_suffix, boost_thread)
dynamic_ffmpeg(conf)
+ dynamic_openjpeg(conf)
dynamic_dcp(conf)
dynamic_ssh(conf)