From 15c0505bc72d41437caef0446174644eb0fd15b4 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 30 Nov 2013 11:49:09 +0000 Subject: [PATCH] More windows installer fixes. --- ChangeLog | 4 ++++ platform/windows/installer.nsi.32.in | 12 ++++++------ platform/windows/installer.nsi.64.in | 12 ++++++------ 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 24fd334fe..1c8670975 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-11-30 Carl Hetherington + + * Fix windows build. + 2013-11-29 Carl Hetherington * Version 1.38 released. diff --git a/platform/windows/installer.nsi.32.in b/platform/windows/installer.nsi.32.in index 629edd50c..6201b9fd7 100644 --- 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 de1e09107..ba6f7b132 100644 --- 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" -- 2.30.2