From 6c5adde19a06c36b4819c2a10e429a5a81f6084c Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Mon, 19 Aug 2013 09:07:22 -0700 Subject: [PATCH] Fix wx compilation and silence a warning when compiling wx --- aegisub/build/wx/setup-build.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/aegisub/build/wx/setup-build.h b/aegisub/build/wx/setup-build.h index b41411b02..f96ac6afe 100644 --- a/aegisub/build/wx/setup-build.h +++ b/aegisub/build/wx/setup-build.h @@ -3,6 +3,9 @@ #ifndef wxUSE_GUI #define wxUSE_GUI 1 #endif +#ifdef wxUSE_UNICODE +#undef wxUSE_UNICODE +#endif #define WXWIN_COMPATIBILITY_2_4 0 #define WXWIN_COMPATIBILITY_2_6 0 #define WXWIN_COMPATIBILITY_2_8 0 @@ -249,4 +252,5 @@ #define wxUSE_WEBVIEW 0 #define wxUSE_RICHTOOLTIP 0 #define wxUSE_COMPILER_TLS 1 +#define wxUSE_PREFERENCES_EDITOR 0 #endif