Switch wx-3.0 -> wx-3.1 on Windows.

diff --git a/platform/windows/dcpomatic.rc b/platform/windows/dcpomatic.rc
index 4afb67abd41dfa95a641ebc1803fcd7f17b65b5d..e58e81b7f4fd87216978cea094809c11c3d4313d 100644 (file)
--- a/platform/windows/dcpomatic.rc
+++ b/platform/windows/dcpomatic.rc
@@ -1,2 +1,2 @@
 id ICON "../../graphics/windows/dcpomatic2.ico"
-#include "wx-3.0/wx/msw/wx.rc"
+#include "wx-3.1/wx/msw/wx.rc"

diff --git a/platform/windows/dcpomatic_batch.rc b/platform/windows/dcpomatic_batch.rc
index c775bed2125c0b81be1a3f37d626e5403d2e9c02..9aea3811038fd9646ddd700e61b8c280898cef43 100644 (file)
--- a/platform/windows/dcpomatic_batch.rc
+++ b/platform/windows/dcpomatic_batch.rc
@@ -1,2 +1,2 @@
 id ICON "../../graphics/windows/dcpomatic2_batch.ico"
-#include "wx-3.0/wx/msw/wx.rc"
+#include "wx-3.1/wx/msw/wx.rc"

diff --git a/platform/windows/dcpomatic_combiner.rc b/platform/windows/dcpomatic_combiner.rc
index 1b72bf58a180e4c62e70ff5c3d48dd92de08eac9..700d85a8b49770495e4f9501792d4b9d26881d0f 100644 (file)
--- a/platform/windows/dcpomatic_combiner.rc
+++ b/platform/windows/dcpomatic_combiner.rc
@@ -1,2 +1,2 @@
 id ICON "../../graphics/windows/dcpomatic2_combiner.ico"
-#include "wx-3.0/wx/msw/wx.rc"
+#include "wx-3.1/wx/msw/wx.rc"

diff --git a/platform/windows/dcpomatic_disk.rc b/platform/windows/dcpomatic_disk.rc
index e10e89e2f25d83a8f31cc6075cd1987fa02e536f..eac76a0d59c6996133690a052c06a01ee970ce45 100644 (file)
--- a/platform/windows/dcpomatic_disk.rc
+++ b/platform/windows/dcpomatic_disk.rc
@@ -1,2 +1,2 @@
 id ICON "../../graphics/windows/dcpomatic2_disk.ico"
-#include "wx-3.0/wx/msw/wx.rc"
+#include "wx-3.1/wx/msw/wx.rc"

diff --git a/platform/windows/dcpomatic_kdm.rc b/platform/windows/dcpomatic_kdm.rc
index 2ebaef50ac96be22a9fbfb9247f31c11ac965aea..057a42c012c27c0761c2905315949fa1903da5d3 100644 (file)
--- a/platform/windows/dcpomatic_kdm.rc
+++ b/platform/windows/dcpomatic_kdm.rc
@@ -1,2 +1,2 @@
 id ICON "../../graphics/windows/dcpomatic2_kdm.ico"
-#include "wx-3.0/wx/msw/wx.rc"
+#include "wx-3.1/wx/msw/wx.rc"

diff --git a/platform/windows/dcpomatic_player.rc b/platform/windows/dcpomatic_player.rc
index 62b9f28a49e52f935e77bd6eb3bf5a2cb7609c33..dd5e0d1fe1c542a5c385814b0e08dcab2e012eaf 100644 (file)
--- a/platform/windows/dcpomatic_player.rc
+++ b/platform/windows/dcpomatic_player.rc
@@ -1,2 +1,2 @@
 id ICON "../../graphics/windows/dcpomatic2_player.ico"
-#include "wx-3.0/wx/msw/wx.rc"
+#include "wx-3.1/wx/msw/wx.rc"

diff --git a/platform/windows/dcpomatic_playlist.rc b/platform/windows/dcpomatic_playlist.rc
index 64f48a721ebf61e444dbb81fb87669a01bd36742..2bb457371419d475bea01658acbc748dd5ac5ac6 100644 (file)
--- a/platform/windows/dcpomatic_playlist.rc
+++ b/platform/windows/dcpomatic_playlist.rc
@@ -1,2 +1,2 @@
 id ICON "../../graphics/windows/dcpomatic2_playlist.ico"
-#include "wx-3.0/wx/msw/wx.rc"
+#include "wx-3.1/wx/msw/wx.rc"

diff --git a/platform/windows/dcpomatic_server.rc b/platform/windows/dcpomatic_server.rc
index 3a036c79147b286cd2da96c3ea130dc07cc0eaed..fb9f4e811bcf04fc5ee998b4e976ddb022444e41 100644 (file)
--- a/platform/windows/dcpomatic_server.rc
+++ b/platform/windows/dcpomatic_server.rc
@@ -1,2 +1,2 @@
 id ICON "../../graphics/windows/dcpomatic2_server.ico"
-#include "wx-3.0/wx/msw/wx.rc"
+#include "wx-3.1/wx/msw/wx.rc"

diff --git a/platform/windows/wscript b/platform/windows/wscript
index 930fbfa0d3448de0d0ca61d3d5d422245b53d7e0..4ae96bb0abbf7f452425c97c2a6681a4271d9495 100644 (file)
--- a/platform/windows/wscript
+++ b/platform/windows/wscript
@@ -109,14 +109,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/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/wxmsw30u_gl_gcc_custom.dll"
-File "%static_deps%/bin/wxmsw30u_propgrid_gcc_custom.dll"
-File "%static_deps%/bin/wxbase30u_xml_gcc_custom.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/libcairo-2.dll"
 File "%static_deps%/bin/libfreetype-6.dll"
 File "%static_deps%/bin/libgthread-2.0-0.dll"