Try to fix OS X build.

[dcpomatic.git] / wscript

diff --git a/wscript b/wscript
index 78958d22b68a3a30094c9ea6804975a15580f97f..c16060e611128a7a89312ba986c49c08abaf4a98 100644 (file)
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
 import sys
 
 APPNAME = 'dcpomatic'
-VERSION = '1.64.4'
+VERSION = '1.64.4devel'
 
 def options(opt):
     opt.load('compiler_cxx')
@@ -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]
@@ -76,8 +80,6 @@ def static_dcp(conf, static_boost, static_xmlpp, static_xmlsec, static_ssh):
     else:
         conf.env.LIB_DCP.append('ssh')
 
-
-
 def dynamic_dcp(conf):
     conf.check_cfg(package='libdcp', atleast_version='0.92', args='--cflags --libs', uselib_store='DCP', mandatory=True)
     conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP]
@@ -274,6 +276,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)
 
@@ -286,6 +289,7 @@ def configure(conf):
         dynamic_boost(conf, boost_lib_suffix, boost_thread)
         dynamic_ffmpeg(conf)
         dynamic_dcp(conf)
+        dynamic_openjpeg(conf)
         dynamic_ssh(conf)
 
     # Dependencies which are always dynamically linked