From f51e7b14839c031f4a2bd174aff83049e9f5f59b Mon Sep 17 00:00:00 2001
From: Niels Martin Hansen <nielsm@aegisub.org>
Date: Sat, 25 Jul 2009 19:39:34 +0000
Subject: [PATCH] Let's make setup.cpp fail on wx 2.8

Originally committed to SVN as r3282.
---
 aegisub/src/setup.cpp | 37 ++++---------------------------------
 1 file changed, 4 insertions(+), 33 deletions(-)

diff --git a/aegisub/src/setup.cpp b/aegisub/src/setup.cpp
index 0d4182036..32042254d 100644
--- a/aegisub/src/setup.cpp
+++ b/aegisub/src/setup.cpp
@@ -49,16 +49,10 @@
 
 /////////////
 // wxWidgets
+#if wxCHECK_VERSION(2, 9, 0)
 #ifdef __WXDEBUG__
 #pragma comment(lib, "wxzlibd.lib")
 #pragma comment(lib, "wxpngd.lib")
-#else
-#pragma comment(lib, "wxzlib.lib")
-#pragma comment(lib, "wxpng.lib")
-#endif
-
-#if wxCHECK_VERSION(2, 9, 0)
-#ifdef __WXDEBUG__
 #pragma comment(lib, "wxregexud.lib")
 #pragma comment(lib, "wxbase29ud.lib")
 #pragma comment(lib, "wxbase29ud_net.lib")
@@ -71,6 +65,8 @@
 #pragma comment(lib, "wxbase29ud_xml.lib")
 #pragma comment(lib, "wxexpatd.lib")
 #else
+#pragma comment(lib, "wxzlib.lib")
+#pragma comment(lib, "wxpng.lib")
 #pragma comment(lib, "wxregexu.lib")
 #pragma comment(lib, "wxbase29u.lib")
 #pragma comment(lib, "wxbase29u_net.lib")
@@ -84,34 +80,9 @@
 #pragma comment(lib, "wxexpat.lib")
 #endif
 
-#elif wxCHECK_VERSION(2, 8, 0)
-#ifdef __WXDEBUG__
-#pragma comment(lib, "wxregexud.lib")
-#pragma comment(lib, "wxbase28ud.lib")
-#pragma comment(lib, "wxbase28ud_net.lib")
-#pragma comment(lib, "wxmsw28ud_media.lib")
-#pragma comment(lib, "wxmsw28ud_core.lib")
-#pragma comment(lib, "wxmsw28ud_adv.lib")
-#pragma comment(lib, "wxmsw28ud_gl.lib")
-#pragma comment(lib, "wxmsw28ud_stc.lib")
-#pragma comment(lib, "wxbase28ud_xml.lib")
-#pragma comment(lib, "wxexpatd.lib")
-#else
-#pragma comment(lib, "wxregexu.lib")
-#pragma comment(lib, "wxbase28u.lib")
-#pragma comment(lib, "wxbase28u_net.lib")
-#pragma comment(lib, "wxmsw28u_media.lib")
-#pragma comment(lib, "wxmsw28u_core.lib")
-#pragma comment(lib, "wxmsw28u_adv.lib")
-#pragma comment(lib, "wxmsw28u_gl.lib")
-#pragma comment(lib, "wxmsw28u_stc.lib")
-#pragma comment(lib, "wxbase28u_xml.lib")
-#pragma comment(lib, "wxexpat.lib")
-#endif
-
 #else 
 
-#error "Aegisub requires wxWidgets 2.8.0 or superior"
+#error "Aegisub requires wxWidgets 2.9"
 
 #endif // wxWidgets