diff --git a/quakespasm/MacOSX/SDLApplication.h b/quakespasm/MacOSX/SDLApplication.h index abc4b4ed..6dfc6050 100644 --- a/quakespasm/MacOSX/SDLApplication.h +++ b/quakespasm/MacOSX/SDLApplication.h @@ -20,9 +20,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #import - +#if !defined(USE_SDL2) @interface SDLApplication : NSApplication { } @end +#endif diff --git a/quakespasm/MacOSX/SDLApplication.m b/quakespasm/MacOSX/SDLApplication.m index 20aeaa33..c316bda4 100644 --- a/quakespasm/MacOSX/SDLApplication.m +++ b/quakespasm/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 -#else #import -#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