From 37afdeb40495f7eecb5d21126bf71412aa9db25b Mon Sep 17 00:00:00 2001
From: Eric Wasylishen <ewasylishen@gmail.com>
Date: Thu, 13 Oct 2016 20:05:26 +0000
Subject: [PATCH] macOS: omit the SDLApplication class under SDL2.

SDL2 has an SDLApplication class internally which does the same thing. Fixes this warning:

objc[34880]: Class SDLApplication is implemented in both [...]/QuakeSpasm-SDL2.app/Contents/Frameworks/SDL2.framework/Versions/A/SDL2 (0x10365b5a0) and [...]/QuakeSpasm-SDL2.app/Contents/MacOS/QuakeSpasm-SDL2 (0x1002708e8). One of the two will be used. Which one is undefined.

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1348 af15c1b1-3010-417e-b628-4374ebc0bcbd
---
 MacOSX/SDLApplication.h |  3 ++-
 MacOSX/SDLApplication.m | 10 ++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/MacOSX/SDLApplication.h b/MacOSX/SDLApplication.h
index abc4b4ed..6dfc6050 100644
--- a/MacOSX/SDLApplication.h
+++ b/MacOSX/SDLApplication.h
@@ -20,9 +20,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #import <Cocoa/Cocoa.h>
 
-
+#if !defined(USE_SDL2)
 @interface SDLApplication : NSApplication {
 
 }
 
 @end
+#endif
diff --git a/MacOSX/SDLApplication.m b/MacOSX/SDLApplication.m
index 20aeaa33..c316bda4 100644
--- a/MacOSX/SDLApplication.m
+++ b/MacOSX/SDLApplication.m
@@ -19,12 +19,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 #import "SDLApplication.h"
+
+// ericw -- with SDL2, this is unneeded and clashes; it has an SDLApplication class internally which does the same thing
+#if !defined(USE_SDL2)
+
 #if defined(SDL_FRAMEWORK) || defined(NO_SDL_CONFIG)
-#if defined(USE_SDL2)
-#import <SDL2/SDL.h>
-#else
 #import <SDL/SDL.h>
-#endif
 #else
 #import "SDL.h"
 #endif
@@ -40,3 +40,5 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
     [super terminate:sender];
 }
 @end
+
+#endif