diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-01-11 22:59:52 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-01-11 22:59:52 +0000 |
| commit | fbc0f098149febf822e4e53d6026120e6a273be8 (patch) | |
| tree | 186458c8991185e0b4e778582243444265907995 /src/tools/wscript | |
| parent | 14d37e152969fb557401c663f5785fb55f5b6848 (diff) | |
Update waf.
Diffstat (limited to 'src/tools/wscript')
| -rw-r--r-- | src/tools/wscript | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/tools/wscript b/src/tools/wscript index ecbefe4c6..fb1f71654 100644 --- a/src/tools/wscript +++ b/src/tools/wscript @@ -11,7 +11,7 @@ def configure(conf): def build(bld): 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 OPENJPEG DCP CXML AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC WXWIDGETS SUB CURL' + obj.uselib = 'BOOST_THREAD BOOST_DATETIME BOOST_FILESYSTEM OPENJPEG DCP CXML AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC WXWIDGETS SUB CURL' obj.includes = ['..'] obj.use = ['libdcpomatic2'] obj.source = '%s.cc' % t @@ -22,8 +22,8 @@ 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 OPENJPEG DCP CXML AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC CXML WXWIDGETS SUB CURL' - if bld.env.BUILD_STATIC: + obj.uselib = 'BOOST_THREAD BOOST_DATETIME BOOST_FILESYSTEM OPENJPEG DCP CXML AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC CXML WXWIDGETS SUB CURL' + if bld.env.BUILD_STATIC or bld.env.TARGET_LINUX: obj.uselib += ' GTK' obj.includes = ['..'] obj.use = ['libdcpomatic2', 'libdcpomatic2-wx'] |