projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
53cafa3
)
Bump wxwidgets version.
author
Carl Hetherington
<cth@carlh.net>
Thu, 28 Nov 2013 12:52:48 +0000
(12:52 +0000)
committer
Carl Hetherington
<cth@carlh.net>
Thu, 28 Nov 2013 12:52:48 +0000
(12:52 +0000)
src/wx/wscript
patch
|
blob
|
history
diff --git
a/src/wx/wscript
b/src/wx/wscript
index 084e5cc689f1847d9c1f56f26fe4f777e62f6998..34047f3ac6b5faa82e7753caac63d5d2ba8e5aac 100644
(file)
--- a/
src/wx/wscript
+++ b/
src/wx/wscript
@@
-54,15
+54,15
@@
def configure(conf):
if conf.env.STATIC:
# wx-config returns its static libraries as full paths, without -l prefixes, which confuses
# check_cfg(), so just hard-code it all.
if conf.env.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-
2.9', 'wx_gtk2u_xrc-2.9', 'wx_gtk2u_qa-2.9', 'wx_baseu_net-2.9', 'wx_gtk2u_html-2.9
',
- 'wx_gtk2u_adv-
2.9', 'wx_gtk2u_core-2.9', 'wx_baseu_xml-2.9', 'wx_baseu-2.9
']
+ 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
',
+ 'wx_gtk2u_adv-
3.0', 'wx_gtk2u_core-3.0', 'wx_baseu_xml-3.0', 'wx_baseu-3.0
']
conf.env.LIB_WXWIDGETS = ['tiff', 'SM', 'dl', 'jpeg', 'png', 'X11', 'expat']
conf.in_msg = 1
wx_version = conf.check_cfg(package='', path=conf.options.wx_config, args='--version').strip()
conf.im_msg = 0
conf.env.LIB_WXWIDGETS = ['tiff', 'SM', 'dl', 'jpeg', 'png', 'X11', 'expat']
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' and wx_version != '2.9.5
':
- conf.fatal('wxwidgets version
2.9.4 or 2.9.5
is required; %s found' % wx_version)
+ if wx_version != '
3.0.0
':
+ conf.fatal('wxwidgets version
3.0.0
is required; %s found' % wx_version)
def build(bld):
if bld.env.STATIC:
def build(bld):
if bld.env.STATIC: