summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2012-12-19 10:09:05 +0000
committerCarl Hetherington <cth@carlh.net>2012-12-19 10:09:05 +0000
commit8d9acccb5488a3dc00746e424fdd5997f2aae267 (patch)
tree386c97833b6176eea41bc1a34a5c2197696ccf8a /src
parent02737df8ca6ef9b3cee6bed0ceb0b35798769ae5 (diff)
Try to make windows installer work with wx 2.9.4.
Diffstat (limited to 'src')
-rw-r--r--src/wx/wscript5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/wx/wscript b/src/wx/wscript
index 4dbb04eea..b4a6092a6 100644
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -1,5 +1,8 @@
def configure(conf):
- conf.check_cfg(package = '', path = 'wx-config', args = '--cppflags --cxxflags --libs', uselib_store = 'WXWIDGETS', mandatory = True)
+ if bld.env.TARGET_WINDOWS:
+ conf.check_cfg(package = '', atleast_version = '2.9.4', path = 'wx-config', args = '--cppflags --cxxflags --libs', uselib_store = 'WXWIDGETS', mandatory = True)
+ else:
+ conf.check_cfg(package = '', atleast_version = '2.8.12', path = 'wx-config', args = '--cppflags --cxxflags --libs', uselib_store = 'WXWIDGETS', mandatory = True)
def build(bld):
if bld.env.STATIC: