fte
/
quakespasm
mirror of https://github.com/Shpoike/Quakespasm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1348 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
ewasylishen 2016-10-13 20:05:26 +00:00
parent 98a8feaac6
commit 985ead4ea9
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
quakespasm/MacOSX/SDLApplication.h
View File

@ -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

10
quakespasm/MacOSX/SDLApplication.m
View File

@ -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