From cf4e4272f72346c39964b128f78b2297f04dba55 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 17 Mar 2021 11:53:28 +0100 Subject: Tidy how we're finding the tags and xsd directories. --- tools/wscript | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'tools/wscript') diff --git a/tools/wscript b/tools/wscript index 3d07d4b6..2e0d2761 100644 --- a/tools/wscript +++ b/tools/wscript @@ -32,27 +32,29 @@ # def build(bld): + uselib = 'OPENJPEG CXML OPENMP ASDCPLIB_CTH BOOST_FILESYSTEM LIBXML++ XMLSEC1 OPENSSL XERCES DL' + obj = bld(features='cxx cxxprogram') obj.use = ['libdcp%s' % bld.env.API_VERSION] - obj.uselib = 'OPENJPEG CXML OPENMP ASDCPLIB_CTH BOOST_FILESYSTEM LIBXML++ XMLSEC1 OPENSSL XERCES' + obj.uselib = uselib 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 ASDCPLIB_CTH BOOST_FILESYSTEM LIBXML++ XMLSEC1 OPENSSL XERCES' + obj.uselib = uselib 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 ASDCPLIB_CTH BOOST_FILESYSTEM LIBXML++ XMLSEC1 OPENSSL XERCES' + obj.uselib = uselib obj.source = 'dcpverify.cc common.cc' obj.target = 'dcpverify' for f in ['dumpsub', 'decryptmxf', 'kdm', 'thumb', 'recover']: obj = bld(features='cxx cxxprogram') obj.use = ['libdcp%s' % bld.env.API_VERSION] - obj.uselib = 'OPENJPEG CXML OPENMP ASDCPLIB_CTH BOOST_FILESYSTEM LIBXML++ XMLSEC1 OPENSSL XERCES ' + obj.uselib = uselib obj.source = 'dcp%s.cc' % f obj.target = 'dcp%s' % f -- cgit v1.2.3