diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-03-17 11:53:28 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-03-18 23:30:48 +0100 |
| commit | cf4e4272f72346c39964b128f78b2297f04dba55 (patch) | |
| tree | 380d760483d5bf2cec0e33db42e82207b387ecb4 /tools | |
| parent | b0b3c6f0cdc034ef515f72d72fd72fbb71d1ca63 (diff) | |
Tidy how we're finding the tags and xsd directories.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/dcpverify.cc | 2 | ||||
| -rw-r--r-- | tools/wscript | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/tools/dcpverify.cc b/tools/dcpverify.cc index 5739b71a..f29393ed 100644 --- a/tools/dcpverify.cc +++ b/tools/dcpverify.cc @@ -137,7 +137,7 @@ main (int argc, char* argv[]) vector<boost::filesystem::path> directories; directories.push_back (argv[optind]); - auto notes = dcp::verify (directories, bind(&stage, quiet, _1, _2), bind(&progress), "xsd"); + auto notes = dcp::verify (directories, bind(&stage, quiet, _1, _2), bind(&progress)); dcp::filter_notes (notes, ignore_missing_assets); bool failed = false; 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 |