X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fgui%2Fapp.cpp;h=b313f66c6eba21bc35b76fd25b5af6151668a565;hb=6bbf8a69b977644a55a4abdea71dfa9e3bb6c087;hp=bb0f9243bf7e7f5471d2d446e26d4a69cf4913a4;hpb=4c951d1b043c8ee14603ffdc6704962280df40d6;p=virtualjaguar

diff --git a/src/gui/app.cpp b/src/gui/app.cpp
index bb0f924..b313f66 100644
--- a/src/gui/app.cpp
+++ b/src/gui/app.cpp
@@ -10,6 +10,7 @@
 // ---  ----------  -------------------------------------------------------------
 // JLH  12/23/2009  Created this file
 // JLH  01/21/2011  Added SDL initialization
+// JLH  06/26/2011  Added fix to keep SDL from hijacking main() on win32
 //
 
 #include "app.h"
@@ -20,8 +21,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[])