projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e12d8d4
)
Allow build with wx 2.9.5.
author
Carl Hetherington
<cth@carlh.net>
Thu, 8 Aug 2013 09:30:46 +0000
(10:30 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Thu, 8 Aug 2013 09:30:46 +0000
(10:30 +0100)
src/wx/wscript
patch
|
blob
|
history
diff --git
a/src/wx/wscript
b/src/wx/wscript
index 18eb46f82aed6b619f2f785cf4a7897a3344b233..883304effb68e8e3556bbb57eed1ce2e382d6799 100644
(file)
--- a/
src/wx/wscript
+++ b/
src/wx/wscript
@@
-53,8
+53,8
@@
def configure(conf):
conf.in_msg = 1
wx_version = conf.check_cfg(package='', path=conf.options.wx_config, args='--version').strip()
conf.im_msg = 0
- if wx_version != '2.9.4':
- conf.fatal('wxwidgets version 2.9.4 is required; %s found' % wx_version)
+ if wx_version != '2.9.4'
and wx_version != '2.9.5'
:
+ conf.fatal('wxwidgets version 2.9.4
or 2.9.5
is required; %s found' % wx_version)
def build(bld):
if bld.env.STATIC: