Bump versions for new Windows environment.

3 files changed, 31 insertions, 29 deletions

diff --git a/platform/windows/wscript b/platform/windows/wscript
index 83b4380da..8abf85de0 100644
--- a/platform/windows/wscript
+++ b/platform/windows/wscript
@@ -137,14 +137,14 @@ File "%static_deps%/bin/libssh.dll"
 File "%static_deps%/bin/libstdc++-6.dll"
 File "%static_deps%/bin/zlib1.dll"
 File "%static_deps%/bin/libjpeg-9.dll"
-File "%static_deps%/bin/wxbase317u_gcc_custom.dll"
-File "%static_deps%/bin/wxmsw317u_core_gcc_custom.dll"
-File "%static_deps%/bin/wxmsw317u_adv_gcc_custom.dll"
-File "%static_deps%/bin/wxmsw317u_richtext_gcc_custom.dll"
-File "%static_deps%/bin/wxmsw317u_html_gcc_custom.dll"
-File "%static_deps%/bin/wxmsw317u_gl_gcc_custom.dll"
-File "%static_deps%/bin/wxmsw317u_propgrid_gcc_custom.dll"
-File "%static_deps%/bin/wxbase317u_xml_gcc_custom.dll"
+File "%static_deps%/bin/wxbase331u_gcc_custom.dll"
+File "%static_deps%/bin/wxmsw331u_core_gcc_custom.dll"
+File "%static_deps%/bin/wxmsw331u_adv_gcc_custom.dll"
+File "%static_deps%/bin/wxmsw331u_richtext_gcc_custom.dll"
+File "%static_deps%/bin/wxmsw331u_html_gcc_custom.dll"
+File "%static_deps%/bin/wxmsw331u_gl_gcc_custom.dll"
+File "%static_deps%/bin/wxmsw331u_propgrid_gcc_custom.dll"
+File "%static_deps%/bin/wxbase331u_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"
@@ -156,7 +156,7 @@ File "%static_deps%/bin/libpangoft2-1.0-0.dll"
 File "%static_deps%/bin/libtiff-6.dll"
 File "%static_deps%/bin/libglibmm-2.4-1.dll"
 File "%static_deps%/bin/libxml++-2.6-2.dll"
-File "%static_deps%/bin/libxml2-2.dll"
+File "%static_deps%/bin/libxml2-16.dll"
 File "%static_deps%/bin/libpixman-1-0.dll"
 File "%static_deps%/bin/libfontconfig-1.dll"
 File "%static_deps%/bin/libexpat-1.dll"
@@ -165,7 +165,7 @@ File "%static_deps%/bin/libxmlsec1.dll"
 File "%static_deps%/bin/libxmlsec1-openssl.dll"
 File "%static_deps%/bin/libexslt-0.dll"
 File "%static_deps%/bin/libxslt-1.dll"
-File "%static_deps%/bin/libffi-7.dll"
+File "%static_deps%/bin/libffi-8.dll"
 File "%static_deps%/bin/openssl.exe"
 File "%static_deps%/bin/libcurl-4.dll"
 File "%static_deps%/bin/libzip.dll"
@@ -173,22 +173,24 @@ File "%static_deps%/bin/libcairomm-1.0-1.dll"
 File "%static_deps%/bin/libpangomm-1.4-1.dll"
 File "%static_deps%/bin/libsamplerate-0.dll"
 File "%static_deps%/bin/libnettle-8.dll"
-File "%static_deps%/bin/icuuc66.dll"
-File "%static_deps%/bin/icudt66.dll"
-File "%static_deps%/bin/icuin66.dll"
+File "%static_deps%/bin/icuuc74.dll"
+File "%static_deps%/bin/icudt74.dll"
+File "%static_deps%/bin/icuin74.dll"
 File "%static_deps%/bin/liblzma-5.dll"
-File "%static_deps%/bin/libpcre-1.dll"
+File "%static_deps%/bin/libpcre2-16-0.dll"
+File "%static_deps%/bin/libpcre2-8-0.dll"
+File "%static_deps%/bin/libpcre2-posix-3.dll"
 File "%static_deps%/bin/libharfbuzz-0.dll"
 File "%static_deps%/bin/libwinpthread-1.dll"
 File "%static_deps%/bin/libgnutls-30.dll"
 File "%static_deps%/bin/libgmp-10.dll"
 File "%static_deps%/bin/libhogweed-6.dll"
 File "%static_deps%/bin/libidn2-0.dll"
-File "%static_deps%/bin/libunistring-2.dll"
+File "%static_deps%/bin/libunistring-5.dll"
 File "%static_deps%/bin/libssh2-1.dll"
 File "%static_deps%/bin/libgcrypt-20.dll"
 File "%static_deps%/bin/libgpg-error-0.dll"
-File "%static_deps%/bin/libx264-155.dll"
+File "%static_deps%/bin/libx264-165.dll"
 File "%static_deps%/bin/libwebp-7.dll"
 File "%static_deps%/bin/GLEW.dll"
 File "%static_deps%/bin/libdav1d.dll"
@@ -259,47 +261,47 @@ SetOutPath "$INSTDIR\\locale\\fr\\LC_MESSAGES"
 File "%binaries%/src/lib/mo/fr_FR/libdcpomatic2.mo"
 File "%binaries%/src/wx/mo/fr_FR/libdcpomatic2-wx.mo"
 File "%binaries%/src/tools/mo/fr_FR/dcpomatic2.mo"
-File "%static_deps%/share/locale/fr/LC_MESSAGES/wxstd-3.1.mo"
+File "%static_deps%/share/locale/fr/LC_MESSAGES/wxstd-3.3.mo"
 SetOutPath "$INSTDIR\\locale\\it\\LC_MESSAGES"
 File "%binaries%/src/lib/mo/it_IT/libdcpomatic2.mo"
 File "%binaries%/src/wx/mo/it_IT/libdcpomatic2-wx.mo"
 File "%binaries%/src/tools/mo/it_IT/dcpomatic2.mo"
-File "%static_deps%/share/locale/it/LC_MESSAGES/wxstd-3.1.mo"
+File "%static_deps%/share/locale/it/LC_MESSAGES/wxstd-3.3.mo"
 SetOutPath "$INSTDIR\\locale\\es\\LC_MESSAGES"
 File "%binaries%/src/lib/mo/es_ES/libdcpomatic2.mo"
 File "%binaries%/src/wx/mo/es_ES/libdcpomatic2-wx.mo"
 File "%binaries%/src/tools/mo/es_ES/dcpomatic2.mo"
-File "%static_deps%/share/locale/es/LC_MESSAGES/wxstd-3.1.mo"
+File "%static_deps%/share/locale/es/LC_MESSAGES/wxstd-3.3.mo"
 SetOutPath "$INSTDIR\\locale\\sv\\LC_MESSAGES"
 File "%binaries%/src/lib/mo/sv_SE/libdcpomatic2.mo"
 File "%binaries%/src/wx/mo/sv_SE/libdcpomatic2-wx.mo"
 File "%binaries%/src/tools/mo/sv_SE/dcpomatic2.mo"
-File "%static_deps%/share/locale/sv/LC_MESSAGES/wxstd-3.1.mo"
+File "%static_deps%/share/locale/sv/LC_MESSAGES/wxstd-3.3.mo"
 SetOutPath "$INSTDIR\\locale\\de\\LC_MESSAGES"
 File "%binaries%/src/lib/mo/de_DE/libdcpomatic2.mo"
 File "%binaries%/src/wx/mo/de_DE/libdcpomatic2-wx.mo"
 File "%binaries%/src/tools/mo/de_DE/dcpomatic2.mo"
-File "%static_deps%/share/locale/de/LC_MESSAGES/wxstd-3.1.mo"
+File "%static_deps%/share/locale/de/LC_MESSAGES/wxstd-3.3.mo"
 SetOutPath "$INSTDIR\\locale\\nl\\LC_MESSAGES"
 File "%binaries%/src/lib/mo/nl_NL/libdcpomatic2.mo"
 File "%binaries%/src/wx/mo/nl_NL/libdcpomatic2-wx.mo"
 File "%binaries%/src/tools/mo/nl_NL/dcpomatic2.mo"
-File "%static_deps%/share/locale/nl/LC_MESSAGES/wxstd-3.1.mo"
+File "%static_deps%/share/locale/nl/LC_MESSAGES/wxstd-3.3.mo"
 SetOutPath "$INSTDIR\\locale\\ru\\LC_MESSAGES"
 File "%binaries%/src/lib/mo/ru_RU/libdcpomatic2.mo"
 File "%binaries%/src/wx/mo/ru_RU/libdcpomatic2-wx.mo"
 File "%binaries%/src/tools/mo/ru_RU/dcpomatic2.mo"
-File "%static_deps%/share/locale/ru/LC_MESSAGES/wxstd-3.1.mo"
+File "%static_deps%/share/locale/ru/LC_MESSAGES/wxstd-3.3.mo"
 SetOutPath "$INSTDIR\\locale\\pl\\LC_MESSAGES"
 File "%binaries%/src/lib/mo/pl_PL/libdcpomatic2.mo"
 File "%binaries%/src/wx/mo/pl_PL/libdcpomatic2-wx.mo"
 File "%binaries%/src/tools/mo/pl_PL/dcpomatic2.mo"
-File "%static_deps%/share/locale/pl/LC_MESSAGES/wxstd-3.1.mo"
+File "%static_deps%/share/locale/pl/LC_MESSAGES/wxstd-3.3.mo"
 SetOutPath "$INSTDIR\\locale\\da\\LC_MESSAGES"
 File "%binaries%/src/lib/mo/da_DK/libdcpomatic2.mo"
 File "%binaries%/src/wx/mo/da_DK/libdcpomatic2-wx.mo"
 File "%binaries%/src/tools/mo/da_DK/dcpomatic2.mo"
-File "%static_deps%/share/locale/da/LC_MESSAGES/wxstd-3.1.mo"
+File "%static_deps%/share/locale/da/LC_MESSAGES/wxstd-3.3.mo"
 SetOutPath "$INSTDIR\\locale\\pt_PT\\LC_MESSAGES"
 File "%binaries%/src/lib/mo/pt_PT/libdcpomatic2.mo"
 File "%binaries%/src/wx/mo/pt_PT/libdcpomatic2-wx.mo"
@@ -316,7 +318,7 @@ SetOutPath "$INSTDIR\\locale\\cs\\LC_MESSAGES"
 File "%binaries%/src/lib/mo/cs_CZ/libdcpomatic2.mo"
 File "%binaries%/src/wx/mo/cs_CZ/libdcpomatic2-wx.mo"
 File "%binaries%/src/tools/mo/cs_CZ/dcpomatic2.mo"
-File "%static_deps%/share/locale/cs/LC_MESSAGES/wxstd-3.1.mo"
+File "%static_deps%/share/locale/cs/LC_MESSAGES/wxstd-3.3.mo"
 SetOutPath "$INSTDIR\\locale\\uk\\LC_MESSAGES"
 File "%binaries%/src/lib/mo/uk_UA/libdcpomatic2.mo"
 File "%binaries%/src/wx/mo/uk_UA/libdcpomatic2-wx.mo"
@@ -341,7 +343,7 @@ SetOutPath "$INSTDIR\\locale\\fa_IR\\LC_MESSAGES"
 File "%binaries%/src/lib/mo/fa_IR/libdcpomatic2.mo"
 File "%binaries%/src/wx/mo/fa_IR/libdcpomatic2-wx.mo"
 File "%binaries%/src/tools/mo/fa_IR/dcpomatic2.mo"
-File /oname=wxstd-3.1.mo "%binaries%/src/wx/mo/fa_IR/wxstd.mo"
+File /oname=wxstd-3.3.mo "%binaries%/src/wx/mo/fa_IR/wxstd.mo"
 
 SetOutPath "$INSTDIR"
 File "%resources%/../../fonts/LiberationSans-Regular.ttf"
diff --git a/src/tools/wscript b/src/tools/wscript
index 3128486f5..71fc6a5c6 100644
--- a/src/tools/wscript
+++ b/src/tools/wscript
@@ -61,7 +61,7 @@ def make_rc(tool, icon, variant):
         else:
             print("""
 id ICON "../../graphics/windows/%s"
-#include "wx-3.1/wx/msw/wx.rc"
+#include "wx-3.3/wx/msw/wx.rc"
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION    0,0,0,2
  PRODUCTVERSION 0,0,0,2
diff --git a/src/wx/i18n_setup_windows.cc b/src/wx/i18n_setup_windows.cc
index 0fc4ecdd5..5d499fa2a 100644
--- a/src/wx/i18n_setup_windows.cc
+++ b/src/wx/i18n_setup_windows.cc
@@ -43,7 +43,7 @@ dcpomatic::wx::setup_i18n()
 		locale = new wxLocale(language, wxLOCALE_LOAD_DEFAULT);
 
 		locale->AddCatalogLookupPathPrefix(std_to_wx(mo_path().string()));
-		locale->AddCatalog(char_to_wx("wxstd-3.1"));
+		locale->AddCatalog(char_to_wx("wxstd-3.3"));
 
 		locale->AddCatalog(char_to_wx("wxstd"));
 		locale->AddCatalog(char_to_wx("libdcpomatic2-wx"));