From a0fa7ae7ddac1afc83c04a39e25fec3f4b942a04 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 16 Jul 2014 11:35:49 +0100 Subject: Fix mis-merge. --- wscript | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'wscript') diff --git a/wscript b/wscript index 681654bb8..c2bbac562 100644 --- a/wscript +++ b/wscript @@ -58,11 +58,7 @@ def dynamic_openjpeg(conf): conf.check_cfg(package='libopenjpeg', args='--cflags --libs', max_version='1.5.2', mandatory=True) def static_dcp(conf, static_boost, static_xmlpp, static_xmlsec, static_ssh): -<<<<<<< HEAD - conf.check_cfg(package='libdcp-1.0', atleast_version='0.95', args='--cflags', uselib_store='DCP', mandatory=True) -======= - conf.check_cfg(package='libdcp', atleast_version='0.96', args='--cflags', uselib_store='DCP', mandatory=True) ->>>>>>> origin/master + conf.check_cfg(package='libdcp-1.0', atleast_version='0.96', args='--cflags', uselib_store='DCP', mandatory=True) conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP] conf.env.STLIB_DCP = ['dcp-1.0', 'asdcp-libdcp-1.0', 'kumu-libdcp-1.0'] conf.env.LIB_DCP = ['glibmm-2.4', 'ssl', 'crypto', 'bz2', 'xslt'] -- cgit v1.2.3