Let's make setup.cpp fail on wx 2.8
Originally committed to SVN as r3282.
This commit is contained in:
parent
6da57c3c8d
commit
f51e7b1483
1 changed files with 4 additions and 33 deletions
|
@ -49,16 +49,10 @@
|
||||||
|
|
||||||
/////////////
|
/////////////
|
||||||
// wxWidgets
|
// wxWidgets
|
||||||
|
#if wxCHECK_VERSION(2, 9, 0)
|
||||||
#ifdef __WXDEBUG__
|
#ifdef __WXDEBUG__
|
||||||
#pragma comment(lib, "wxzlibd.lib")
|
#pragma comment(lib, "wxzlibd.lib")
|
||||||
#pragma comment(lib, "wxpngd.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, "wxregexud.lib")
|
||||||
#pragma comment(lib, "wxbase29ud.lib")
|
#pragma comment(lib, "wxbase29ud.lib")
|
||||||
#pragma comment(lib, "wxbase29ud_net.lib")
|
#pragma comment(lib, "wxbase29ud_net.lib")
|
||||||
|
@ -71,6 +65,8 @@
|
||||||
#pragma comment(lib, "wxbase29ud_xml.lib")
|
#pragma comment(lib, "wxbase29ud_xml.lib")
|
||||||
#pragma comment(lib, "wxexpatd.lib")
|
#pragma comment(lib, "wxexpatd.lib")
|
||||||
#else
|
#else
|
||||||
|
#pragma comment(lib, "wxzlib.lib")
|
||||||
|
#pragma comment(lib, "wxpng.lib")
|
||||||
#pragma comment(lib, "wxregexu.lib")
|
#pragma comment(lib, "wxregexu.lib")
|
||||||
#pragma comment(lib, "wxbase29u.lib")
|
#pragma comment(lib, "wxbase29u.lib")
|
||||||
#pragma comment(lib, "wxbase29u_net.lib")
|
#pragma comment(lib, "wxbase29u_net.lib")
|
||||||
|
@ -84,34 +80,9 @@
|
||||||
#pragma comment(lib, "wxexpat.lib")
|
#pragma comment(lib, "wxexpat.lib")
|
||||||
#endif
|
#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
|
#else
|
||||||
|
|
||||||
#error "Aegisub requires wxWidgets 2.8.0 or superior"
|
#error "Aegisub requires wxWidgets 2.9"
|
||||||
|
|
||||||
#endif // wxWidgets
|
#endif // wxWidgets
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue