projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
wx
/
wscript
diff --git
a/src/wx/wscript
b/src/wx/wscript
index bc21f9d81b22277723133598f748ad13ed05b08f..bb530989452cee3e6558a322f85cafb83197bde6 100644
(file)
--- a/
src/wx/wscript
+++ b/
src/wx/wscript
@@
-72,8
+72,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
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 != '3.0.0'
:
- conf.fatal('wxwidgets version 3.0.
0
is required; %s found' % wx_version)
+ if
not wx_version.startswith('3.0.')
:
+ conf.fatal('wxwidgets version 3.0.
x
is required; %s found' % wx_version)
def build(bld):
if bld.env.BUILD_STATIC:
def build(bld):
if bld.env.BUILD_STATIC: