diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-02-11 12:04:27 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-02-11 12:04:27 +0000 |
| commit | 8aeb741ccbe2edb528e98a431bf55459a6836a9b (patch) | |
| tree | a14569b531d9867683a1ac1c94c8e0eb406906a8 /src/wx/wscript | |
| parent | 4ba8772aef261da209bbb882325fd61a8b479fd7 (diff) | |
| parent | 22f2cd94132f93a159c2ce9fe263771cb5a5dbdf (diff) | |
Merge master.
Diffstat (limited to 'src/wx/wscript')
| -rw-r--r-- | src/wx/wscript | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/wx/wscript b/src/wx/wscript index 9de32d39e..1ffaa6097 100644 --- a/src/wx/wscript +++ b/src/wx/wscript @@ -47,13 +47,13 @@ sources = """ def configure(conf): args = '--cppflags --cxxflags' - if not conf.env.STATIC: + if not conf.env.BUILD_STATIC: args += ' --libs std,richtext' conf.check_cfg(msg='Checking for wxWidgets', package='', path=conf.options.wx_config, args=args, uselib_store='WXWIDGETS', mandatory=True) - if conf.env.STATIC: + if conf.env.BUILD_STATIC: # wx-config returns its static libraries as full paths, without -l prefixes, which confuses # check_cfg(), so just hard-code it all. conf.env.STLIB_WXWIDGETS = ['wx_gtk2u_richtext-3.0', 'wx_gtk2u_xrc-3.0', 'wx_gtk2u_qa-3.0', 'wx_baseu_net-3.0', 'wx_gtk2u_html-3.0', @@ -67,14 +67,14 @@ def configure(conf): conf.fatal('wxwidgets version 3.0.0 is required; %s found' % wx_version) def build(bld): - if bld.env.STATIC: + if bld.env.BUILD_STATIC: obj = bld(features = 'cxx cxxstlib') else: obj = bld(features = 'cxx cxxshlib') obj.name = 'libdcpomatic-wx' obj.export_includes = ['..'] - obj.uselib = 'WXWIDGETS' + obj.uselib = 'WXWIDGETS DCP' if bld.env.TARGET_LINUX: obj.uselib += ' GTK' obj.use = 'libdcpomatic' |