More windows installer fixes.

diff --git a/ChangeLog b/ChangeLog
index 24fd334fec5340c50115ce36f273d3047c4aa132..1c86709759c64feb5171872f3a65e83068006d9c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-11-30  Carl Hetherington  <cth@carlh.net>
+
+       * Fix windows build.
+
 2013-11-29  Carl Hetherington  <cth@carlh.net>
 
        * Version 1.38 released.

diff --git a/platform/windows/installer.nsi.32.in b/platform/windows/installer.nsi.32.in
index 629edd50cc3842c16d03f936f98b4dfa4be82543..6201b9fd7a5d96f91e6b846a31e393104a738013 100644 (file)
--- a/platform/windows/installer.nsi.32.in
+++ b/platform/windows/installer.nsi.32.in
@@ -51,12 +51,12 @@ File "%static_deps%/bin/libssh.dll"
 File "%static_deps%/bin/libstdc++-6.dll"
 File "%static_deps%/bin/zlib1.dll"
 File "%static_deps%/bin/libjpeg-8.dll"
-File "%static_deps%/bin/wxbase294u_gcc_custom.dll"
-File "%static_deps%/bin/wxmsw294u_core_gcc_custom.dll"
-File "%static_deps%/bin/wxmsw294u_adv_gcc_custom.dll"
-File "%static_deps%/bin/wxmsw294u_richtext_gcc_custom.dll"
-File "%static_deps%/bin/wxmsw294u_html_gcc_custom.dll"
-File "%static_deps%/bin/wxbase294u_xml_gcc_custom.dll"
+File "%static_deps%/bin/wxbase30u_gcc_custom.dll"
+File "%static_deps%/bin/wxmsw30u_core_gcc_custom.dll"
+File "%static_deps%/bin/wxmsw30u_adv_gcc_custom.dll"
+File "%static_deps%/bin/wxmsw30u_richtext_gcc_custom.dll"
+File "%static_deps%/bin/wxmsw30u_html_gcc_custom.dll"
+File "%static_deps%/bin/wxbase30u_xml_gcc_custom.dll"
 File "%static_deps%/bin/libcairo-2.dll"
 File "%static_deps%/bin/libfreetype-6.dll"
 File "%static_deps%/bin/libgthread-2.0-0.dll"

diff --git a/platform/windows/installer.nsi.64.in b/platform/windows/installer.nsi.64.in
index de1e091076158f9cd4df7894a617257df94a21d7..ba6f7b1327338f06fca892365897dbc41c882a9d 100644 (file)
--- a/platform/windows/installer.nsi.64.in
+++ b/platform/windows/installer.nsi.64.in
@@ -61,12 +61,12 @@ File "%static_deps%/bin/libssh.dll"
 File "%static_deps%/bin/libstdc++-6.dll"
 File "%static_deps%/bin/zlib1.dll"
 File "%static_deps%/bin/libjpeg-8.dll"
-File "%static_deps%/bin/wxbase294u_gcc_custom.dll"
-File "%static_deps%/bin/wxmsw294u_core_gcc_custom.dll"
-File "%static_deps%/bin/wxmsw294u_adv_gcc_custom.dll"
-File "%static_deps%/bin/wxmsw294u_richtext_gcc_custom.dll"
-File "%static_deps%/bin/wxmsw294u_html_gcc_custom.dll"
-File "%static_deps%/bin/wxbase294u_xml_gcc_custom.dll"
+File "%static_deps%/bin/wxbase30u_gcc_custom.dll"
+File "%static_deps%/bin/wxmsw30u_core_gcc_custom.dll"
+File "%static_deps%/bin/wxmsw30u_adv_gcc_custom.dll"
+File "%static_deps%/bin/wxmsw30u_richtext_gcc_custom.dll"
+File "%static_deps%/bin/wxmsw30u_html_gcc_custom.dll"
+File "%static_deps%/bin/wxbase30u_xml_gcc_custom.dll"
 File "%static_deps%/bin/libcairo-2.dll"
 File "%static_deps%/bin/libfreetype-6.dll"
 File "%static_deps%/bin/libgthread-2.0-0.dll"