diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-01-28 21:30:43 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-01-28 22:40:52 +0000 |
| commit | cf4054faa00e63194fd2939d8969d592539428f8 (patch) | |
| tree | b3cf720bd32aabf6f77c887a9d26f818d1a62f70 | |
| parent | 77e4bc52cd7db0e14e66147d04467c0cbda9e437 (diff) | |
Try to fix cscript build.
| -rw-r--r-- | test/wscript | 6 | ||||
| -rw-r--r-- | tools/wscript | 6 | ||||
| -rw-r--r-- | wscript | 5 |
3 files changed, 9 insertions, 8 deletions
diff --git a/test/wscript b/test/wscript index 43db741e..e7cb8694 100644 --- a/test/wscript +++ b/test/wscript @@ -82,7 +82,7 @@ def build(bld): obj = bld(features='cxx cxxprogram') obj.name = 'subs_in_out' - obj.uselib = 'BOOST_TEST BOOST_FILESYSTEM OPENJPEG CXML OPENMP' + obj.uselib = 'BOOST_TEST BOOST_FILESYSTEM OPENJPEG CXML OPENMP ASDCPLIB_CTH' obj.cppflags = ['-fno-inline', '-fno-default-inline', '-fno-elide-constructors', '-g', '-O0'] if bld.is_defined('HAVE_GCOV'): obj.use = 'libdcp%s_gcov' % bld.env.API_VERSION @@ -97,7 +97,7 @@ def build(bld): obj = bld(features='cxx cxxprogram') obj.name = 'rewrite_subs' - obj.uselib = 'BOOST_TEST BOOST_FILESYSTEM OPENJPEG CXML OPENMP' + obj.uselib = 'BOOST_TEST BOOST_FILESYSTEM OPENJPEG CXML OPENMP ASDCPLIB_CTH' obj.cppflags = ['-fno-inline', '-fno-default-inline', '-fno-elide-constructors', '-g', '-O0'] if bld.is_defined('HAVE_GCOV'): obj.use = 'libdcp%s_gcov' % bld.env.API_VERSION @@ -112,7 +112,7 @@ def build(bld): obj = bld(features='cxx cxxprogram') obj.name = 'bench' - obj.uselib = 'BOOST_FILESYSTEM OPENJPEG CXML OPENMP' + obj.uselib = 'BOOST_FILESYSTEM OPENJPEG CXML OPENMP ASDCPLIB_CTH' obj.use = 'libdcp%s' % bld.env.API_VERSION obj.source = 'bench.cc' obj.target = 'bench' diff --git a/tools/wscript b/tools/wscript index 965d1c30..17db4654 100644 --- a/tools/wscript +++ b/tools/wscript @@ -1,18 +1,18 @@ def build(bld): obj = bld(features='cxx cxxprogram') obj.use = ['libdcp%s' % bld.env.API_VERSION] - obj.uselib = 'OPENJPEG CXML OPENMP' + obj.uselib = 'OPENJPEG CXML OPENMP ASDCPLIB_CTH' obj.source = 'dcpdiff.cc common.cc' obj.target = 'dcpdiff' obj = bld(features='cxx cxxprogram') obj.use = ['libdcp%s' % bld.env.API_VERSION] - obj.uselib = 'OPENJPEG CXML OPENMP' + obj.uselib = 'OPENJPEG CXML OPENMP ASDCPLIB_CTH' obj.source = 'dcpinfo.cc common.cc' obj.target = 'dcpinfo' obj = bld(features='cxx cxxprogram') obj.use = ['libdcp%s' % bld.env.API_VERSION] - obj.uselib = 'OPENJPEG CXML OPENMP' + obj.uselib = 'OPENJPEG CXML OPENMP ASDCPLIB_CTH' obj.source = 'dcpdumpsub.cc' obj.target = 'dcpdumpsub' @@ -83,12 +83,13 @@ def configure(conf): conf.env.STLIB_OPENJPEG = ['openjp2'] conf.env.HAVE_CXML = 1 conf.env.STLIB_CXML = ['cxml'] + conf.check_cfg(package='libasdcp-cth', atleast_version='0.0.1', args='--cflags', uselib_store='ASDCPLIB_CTH', mandatory=True) conf.env.HAVE_ASDCPLIB_CTH = 1 - conf.env.STATIC_ASDCPLIB_CTH = ['asdcplib-cth', 'kumu-cth'] + conf.env.STLIB_ASDCPLIB_CTH = ['asdcp-cth', 'kumu-cth'] else: 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) - conf.check_cfg(package='libasdcp-cth', atleast_version='2.5.11-cth1', args='--cflags --libs', uselib_store='ASDCPLIB_CTH', mandatory=True) + conf.check_cfg(package='libasdcp-cth', atleast_version='0.0.1', args='--cflags --libs', uselib_store='ASDCPLIB_CTH', mandatory=True) if conf.options.target_windows: boost_lib_suffix = '-mt' |