From 9370ae9deef6c1657d379624683c17b64f68222e Mon Sep 17 00:00:00 2001 From: Themaister Date: Tue, 26 Feb 2013 08:42:59 +0100 Subject: [PATCH] Should fix OSX. main() must be hacked by SDL_main. --- frontend/frontend.c | 7 +++++++ retroarch.c | 7 ------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/frontend/frontend.c b/frontend/frontend.c index b5756919fa..25774c5e2c 100644 --- a/frontend/frontend.c +++ b/frontend/frontend.c @@ -16,6 +16,13 @@ #include "../general.h" +#ifdef __APPLE__ +#include "SDL.h" +// OSX seems to really need -lSDLmain, +// so we include SDL.h here so it can hack our main. +// We want to use -mconsole in Win32, so we need main(). +#endif + int main(int argc, char *argv[]) { #ifdef HAVE_RARCH_MAIN_IMPLEMENTATION diff --git a/retroarch.c b/retroarch.c index 589d8dfa5c..7269d089f9 100644 --- a/retroarch.c +++ b/retroarch.c @@ -46,13 +46,6 @@ #include "msvc/msvc_compat.h" #endif -#ifdef __APPLE__ -#include "SDL.h" -// OSX seems to really need -lSDLmain, -// so we include SDL.h here so it can hack our main. -// We want to use -mconsole in Win32, so we need main(). -#endif - #if defined(RARCH_CONSOLE) && !defined(RARCH_PERFORMANCE_MODE) #define RARCH_PERFORMANCE_MODE #endif