From 8c5d56734f5c1da1fb4e01bf4b93cb23a5e2da93 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 11 Jan 2015 23:59:53 +0000 Subject: [PATCH] Try to fix build. --- src/tools/wscript | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/tools/wscript b/src/tools/wscript index fb1f71654..e18592852 100644 --- a/src/tools/wscript +++ b/src/tools/wscript @@ -9,9 +9,12 @@ def configure(conf): conf.env.append_value('LINKFLAGS', ['-mconsole']) def build(bld): + + uselib = 'BOOST_THREAD BOOST_DATETIME BOOST_FILESYSTEM OPENJPEG DCP CXML AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC WXWIDGETS SUB CURL GLIB' + for t in ['dcpomatic_cli', 'dcpomatic_server_cli', 'server_test', 'dcpomatic_kdm', 'dcpomatic_create']: obj = bld(features = 'cxx cxxprogram') - obj.uselib = 'BOOST_THREAD BOOST_DATETIME BOOST_FILESYSTEM OPENJPEG DCP CXML AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC WXWIDGETS SUB CURL' + obj.uselib = uselib obj.includes = ['..'] obj.use = ['libdcpomatic2'] obj.source = '%s.cc' % t @@ -22,7 +25,7 @@ def build(bld): if not bld.env.DISABLE_GUI: for t in ['dcpomatic', 'dcpomatic_batch', 'dcpomatic_server']: obj = bld(features = 'cxx cxxprogram') - obj.uselib = 'BOOST_THREAD BOOST_DATETIME BOOST_FILESYSTEM OPENJPEG DCP CXML AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC CXML WXWIDGETS SUB CURL' + obj.uselib = uselib if bld.env.BUILD_STATIC or bld.env.TARGET_LINUX: obj.uselib += ' GTK' obj.includes = ['..'] -- 2.30.2