diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-12-19 10:09:05 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-12-19 10:09:05 +0000 |
| commit | 8d9acccb5488a3dc00746e424fdd5997f2aae267 (patch) | |
| tree | 386c97833b6176eea41bc1a34a5c2197696ccf8a | |
| parent | 02737df8ca6ef9b3cee6bed0ceb0b35798769ae5 (diff) | |
Try to make windows installer work with wx 2.9.4.
| -rw-r--r-- | src/wx/wscript | 5 | ||||
| -rw-r--r-- | windows/installer.nsi.32.in | 6 | ||||
| -rw-r--r-- | windows/installer.nsi.64.in | 6 |
3 files changed, 10 insertions, 7 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: diff --git a/windows/installer.nsi.32.in b/windows/installer.nsi.32.in index 83d0ab4fe..7b34dfea6 100644 --- a/windows/installer.nsi.32.in +++ b/windows/installer.nsi.32.in @@ -61,9 +61,9 @@ File "%deps%/bin/swresample-0.dll" File "%deps%/bin/swscale-2.dll" File "%deps%/bin/zlib1.dll" File "%deps%/bin/libjpeg-8.dll" -File "%deps%/bin/wxbase28_gcc_custom.dll" -File "%deps%/bin/wxmsw28_core_gcc_custom.dll" -File "%deps%/bin/wxmsw28_adv_gcc_custom.dll" +File "%deps%/bin/wxbase294u_gcc_custom.dll" +File "%deps%/bin/wxmsw294u_core_gcc_custom.dll" +File "%deps%/bin/wxmsw294u_adv_gcc_custom.dll" File "%deps%/bin/libcairo-2.dll" File "%deps%/bin/libfreetype-6.dll" File "%deps%/bin/libgthread-2.0-0.dll" diff --git a/windows/installer.nsi.64.in b/windows/installer.nsi.64.in index 0eaea7d9d..d4fa99659 100644 --- a/windows/installer.nsi.64.in +++ b/windows/installer.nsi.64.in @@ -71,9 +71,9 @@ File "%deps%/bin/swresample-0.dll" File "%deps%/bin/swscale-2.dll" File "%deps%/bin/zlib1.dll" File "%deps%/bin/libjpeg-8.dll" -File "%deps%/bin/wxbase28_gcc_custom.dll" -File "%deps%/bin/wxmsw28_core_gcc_custom.dll" -File "%deps%/bin/wxmsw28_adv_gcc_custom.dll" +File "%deps%/bin/wxbase294u_gcc_custom.dll" +File "%deps%/bin/wxmsw294u_core_gcc_custom.dll" +File "%deps%/bin/wxmsw294u_adv_gcc_custom.dll" File "%deps%/bin/libcairo-2.dll" File "%deps%/bin/libfreetype-6.dll" File "%deps%/bin/libgthread-2.0-0.dll" |