From e4c5d95ed37611acc6a186522315195b4ebfb9ef Mon Sep 17 00:00:00 2001 From: Jesse Hall Date: Mon, 9 Jul 2012 11:42:54 -0700 Subject: Apply Android changes from sdl-1.2.12 to sdl-1.2.15 These changes come from diffing Android's sdl-1.2.12 tree against a pure upstream sdl-1.2.12 tree, and then manually applying those differences to the sdl-1.2.15 tree. Change-Id: I05fa6e8004bb629fa2482f092b6ab127b7e51e73 --- distrib/sdl-1.2.15/src/main/macosx/SDLMain.m | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'distrib/sdl-1.2.15/src/main/macosx/SDLMain.m') diff --git a/distrib/sdl-1.2.15/src/main/macosx/SDLMain.m b/distrib/sdl-1.2.15/src/main/macosx/SDLMain.m index 2434f81..7da74b6 100644 --- a/distrib/sdl-1.2.15/src/main/macosx/SDLMain.m +++ b/distrib/sdl-1.2.15/src/main/macosx/SDLMain.m @@ -371,6 +371,20 @@ int main (int argc, char **argv) gFinderLaunch = NO; } +/* ANDROID_BEGIN */ + /* if -no-window is used, we don't want to launch a graphical + * application that creates a Menu bar and steals the focus. + */ + { + int nn; + for (nn = 0; nn < argc; nn++) { + if ( !strcmp( argv[nn], "-no-window" ) ) { + return SDL_main (argc, argv); + } + } + } +/* ANDROID_END */ + #if SDL_USE_NIB_FILE NSApplicationMain (argc, argv); #else -- cgit v1.1