From a837ec444729b2f195506e66a36fe4954741725f Mon Sep 17 00:00:00 2001 From: Shamus Hammons Date: Mon, 27 Jun 2011 16:19:50 +0000 Subject: [PATCH 1/1] Changed previous fix to be win32 only. --- src/gui/app.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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[]) -- 2.37.2