Try to make windows installer work with wx 2.9.4.

diff --git a/src/wx/wscript b/src/wx/wscript
index 4dbb04eeacaa4cc0da3155f09e6243e5934b7dbb..b4a6092a66b423d27cdb0f27245b3594e331fb58 100644 (file)
--- 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 83d0ab4fe88a93d40bac90936eb9a613a81cfbb7..7b34dfea61d47a29741e0171c5809196bbf9b2a0 100644 (file)
--- 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 0eaea7d9d9ab10dedb03331c993ae6817b128c33..d4fa9965918f7e5a9410fc1622a2d3c5b602a51b 100644 (file)
--- 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"