From 6c4db88d264a29033bf4724e5aba9b939e044b4b Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 28 Nov 2015 12:26:31 +0000 Subject: Port to openjpeg version 2.1. --- wscript | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'wscript') diff --git a/wscript b/wscript index 229efa7b..6d97dde2 100644 --- a/wscript +++ b/wscript @@ -61,20 +61,12 @@ def configure(conf): conf.check_cfg(package='sndfile', args='--cflags --libs', uselib_store='SNDFILE', mandatory=False) if conf.options.static: - conf.check_cc(fragment=""" - #include \n - #include \n - int main () {\n - void* p = (void *) opj_image_create;\n - return 0;\n - } - """, - msg='Checking for library openjpeg', stlib='openjpeg', uselib_store='OPENJPEG', mandatory=True) - + conf.check_cfg(package='libopenjp2', args='--cflags', atleast_version='2.1.0', uselib_store='OPENJPEG', mandatory=True) + conf.env.STLIB_OPENJPEG = ['openjpeg'] conf.env.HAVE_CXML = 1 conf.env.STLIB_CXML = ['cxml'] else: - conf.check_cfg(package='libopenjpeg', args='--cflags --libs', uselib_store='OPENJPEG', mandatory=True) + conf.check_cfg(package='libopenjp2', args='--cflags --libs', atleast_version='2.1.0', uselib_store='OPENJPEG', mandatory=True) conf.check_cfg(package='libcxml', atleast_version='0.14.0', args='--cflags --libs', uselib_store='CXML', mandatory=True) if conf.options.target_windows: -- cgit v1.2.3