diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-06-17 01:06:25 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-09-21 09:47:10 +0200 |
| commit | 38d7879904d10ff0b527374ee14bfe0217991d8f (patch) | |
| tree | 940fe044114256a3d703e7626e11826657250b79 | |
| parent | fc4c3e7f0a08d9e2350edb56fa76258114042960 (diff) | |
Switch wx-3.0 -> wx-3.1 on Windows.
| -rw-r--r-- | platform/windows/dcpomatic.rc | 2 | ||||
| -rw-r--r-- | platform/windows/dcpomatic_batch.rc | 2 | ||||
| -rw-r--r-- | platform/windows/dcpomatic_combiner.rc | 2 | ||||
| -rw-r--r-- | platform/windows/dcpomatic_disk.rc | 2 | ||||
| -rw-r--r-- | platform/windows/dcpomatic_kdm.rc | 2 | ||||
| -rw-r--r-- | platform/windows/dcpomatic_player.rc | 2 | ||||
| -rw-r--r-- | platform/windows/dcpomatic_playlist.rc | 2 | ||||
| -rw-r--r-- | platform/windows/dcpomatic_server.rc | 2 | ||||
| -rw-r--r-- | platform/windows/wscript | 16 |
9 files changed, 16 insertions, 16 deletions
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" |
