Update for new mxe.

diff --git a/platform/windows/wscript b/platform/windows/wscript
index 091b22d50fc8711ffbd362e1698a8b1f823d4853..f76f7aedeb63a3a01ad5d35cda0d285efaed9963 100644 (file)
--- a/platform/windows/wscript
+++ b/platform/windows/wscript
@@ -116,14 +116,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/wxbase314u_gcc_custom.dll"
-File "%static_deps%/bin/wxmsw314u_core_gcc_custom.dll"
-File "%static_deps%/bin/wxmsw314u_adv_gcc_custom.dll"
-File "%static_deps%/bin/wxmsw314u_richtext_gcc_custom.dll"
-File "%static_deps%/bin/wxmsw314u_html_gcc_custom.dll"
-File "%static_deps%/bin/wxmsw314u_gl_gcc_custom.dll"
-File "%static_deps%/bin/wxmsw314u_propgrid_gcc_custom.dll"
-File "%static_deps%/bin/wxbase314u_xml_gcc_custom.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/libcairo-2.dll"
 File "%static_deps%/bin/libfreetype-6.dll"
 File "%static_deps%/bin/libgthread-2.0-0.dll"
@@ -131,7 +131,7 @@ File "%static_deps%/bin/libpango-1.0-0.dll"
 File "%static_deps%/bin/libgmodule-2.0-0.dll"
 File "%static_deps%/bin/libpangocairo-1.0-0.dll"
 File "%static_deps%/bin/libpangowin32-1.0-0.dll"
-File "%static_deps%/bin/libtiff-5.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"
@@ -143,7 +143,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-6.dll"
+File "%static_deps%/bin/libffi-7.dll"
 File "%static_deps%/bin/openssl.exe"
 File "%static_deps%/bin/libcurl-4.dll"
 File "%static_deps%/bin/libzip.dll"
@@ -166,7 +166,6 @@ File "%static_deps%/bin/libunistring-2.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/libpangoft2-1.0-0.dll"
 File "%static_deps%/bin/libx264-155.dll"
 File "%static_deps%/bin/libwebp-7.dll"
 File "%static_deps%/bin/GLEW.dll"
@@ -232,47 +231,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.mo"
+File "%static_deps%/share/locale/fr/LC_MESSAGES/wxstd-3.1.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.mo"
+File "%static_deps%/share/locale/it/LC_MESSAGES/wxstd-3.1.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.mo"
+File "%static_deps%/share/locale/es/LC_MESSAGES/wxstd-3.1.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.mo"
+File "%static_deps%/share/locale/sv/LC_MESSAGES/wxstd-3.1.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.mo"
+File "%static_deps%/share/locale/de/LC_MESSAGES/wxstd-3.1.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.mo"
+File "%static_deps%/share/locale/nl/LC_MESSAGES/wxstd-3.1.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.mo"
+File "%static_deps%/share/locale/ru/LC_MESSAGES/wxstd-3.1.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.mo"
+File "%static_deps%/share/locale/pl/LC_MESSAGES/wxstd-3.1.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.mo"
+File "%static_deps%/share/locale/da/LC_MESSAGES/wxstd-3.1.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"
@@ -289,7 +288,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.mo"
+File "%static_deps%/share/locale/cs/LC_MESSAGES/wxstd-3.1.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"

diff --git a/test/data b/test/data
index ae947b7c443a9d04962a8d3a10536b4f3647eb5d..916370761c2451c8f59e978cf9e14fd7aac8319a 160000 (submodule)
--- a/test/data
+++ b/test/data
@@ -1 +1 @@
-Subproject commit ae947b7c443a9d04962a8d3a10536b4f3647eb5d
+Subproject commit 916370761c2451c8f59e978cf9e14fd7aac8319a