diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-01-11 23:59:53 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-01-11 23:59:53 +0000 |
| commit | 8c5d56734f5c1da1fb4e01bf4b93cb23a5e2da93 (patch) | |
| tree | 641a9038214786f9db4bdc977c871acf3c69c41e /src | |
| parent | fae6eb8054d556adf03674d40cade4d8656ab1c1 (diff) | |
Try to fix build.
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/wscript | 7 |
1 files 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 = ['..'] |