From: Shamus Hammons Date: Mon, 27 Jun 2011 16:19:50 +0000 (+0000) Subject: Changed previous fix to be win32 only. X-Git-Tag: 2.0.0~34^2~10 X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a837ec444729b2f195506e66a36fe4954741725f;p=virtualjaguar Changed previous fix to be win32 only. --- diff --git a/src/gui/app.cpp b/src/gui/app.cpp index bb0f924..82a4010 100644 --- a/src/gui/app.cpp +++ b/src/gui/app.cpp @@ -20,8 +20,10 @@ #include "mainwin.h" #include "types.h" -// Apparently on other archs, SDL is hijacking main, so let's do this: +#ifdef __GCCWIN32__ +// Apparently on win32, SDL is hijacking main from Qt. So let's do this: #undef main +#endif // Here's the main application loop--short and simple... int main(int argc, char * argv[])