Support code for macOS binaries that statically linked against 1.2's …

…SDLmain.
libsdl-org · Feb 14, 2019 · c9ddcc1 · c9ddcc1
1 parent bec87e1
commit c9ddcc1
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 0 deletions.
diff --git a/src/SDL12_compat.c b/src/SDL12_compat.c
@@ -719,6 +719,11 @@ SDL_InitSubSystem(Uint32 sdl12flags)
     if (!LoadSDL20())
         return -1;
 
+#ifdef __MACOSX__
+    extern void sdl12_compat_macos_init(void);
+    sdl12_compat_macos_init();
+#endif
+
     #define SETFLAG(flag) if (sdl12flags & SDL12_INIT_##flag) sdl20flags |= SDL_INIT_##flag
     SETFLAG(TIMER);
     SETFLAG(AUDIO);

diff --git a/src/SDL12_compat_objc.m b/src/SDL12_compat_objc.m
@@ -0,0 +1,41 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/* This file contains some macOS-specific support code */
+
+#include "SDL.h"
+
+#ifdef __MACOSX__
+#include <Cocoa/Cocoa.h>
+
+/* This has to be in a separate, Objective-C source file because it calls
+   into Cocoa. The issue is that SDL 1.2 apps on macOS are statically linked
+   with SDLmain, which does something mac-specific that conflicts with SDL2
+   before the app's main() is even called, and we have to counteract that. */
+
+void sdl12_compat_macos_init(void)
+{
+    [[NSApp sharedApplication] setActivationPolicy:NSApplicationActivationPolicyRegular];
+}
+#endif
+
+/* vi: set ts=4 sw=4 expandtab: */
+