From: Carl Hetherington <cth@carlh.net>
Date: Sun, 29 Aug 2021 20:28:41 +0000 (+0200)
Subject: Fix paths for wxWidgets 3.1
X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;ds=sidebyside;h=d6ccae2e2bc499336bdd4cb32100143cbb9b87dd;p=dcpomatic.git

Fix paths for wxWidgets 3.1
---

diff --git a/platform/windows/dcpomatic.rc b/platform/windows/dcpomatic.rc
index 4afb67abd..e58e81b7f 100644
--- 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 c775bed21..9aea38110 100644
--- 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 1b72bf58a..700d85a8b 100644
--- 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 e10e89e2f..eac76a0d5 100644
--- 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 2ebaef50a..057a42c01 100644
--- 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 62b9f28a4..dd5e0d1fe 100644
--- 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 64f48a721..2bb457371 100644
--- 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 3a036c791..fb9f4e811 100644
--- 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 930fbfa0d..4ae96bb0a 100644
--- 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"