From 8c1d3c635c50047d19b178a18a3264e8fca1f0b6 Mon Sep 17 00:00:00 2001 From: Zack Middleton Date: Sat, 19 Oct 2013 01:54:58 -0500 Subject: [PATCH] Use bundle icon on Mac OS X instead of internal 32x32 window icon --- code/sdl/sdl_glimp.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/sdl/sdl_glimp.c b/code/sdl/sdl_glimp.c index 22e70178..166ce52d 100644 --- a/code/sdl/sdl_glimp.c +++ b/code/sdl/sdl_glimp.c @@ -207,6 +207,7 @@ static int GLimp_SetMode(int mode, qboolean fullscreen, qboolean noborder) if ( r_allowResize->integer ) flags |= SDL_WINDOW_RESIZABLE; +#ifdef USE_ICON icon = SDL_CreateRGBSurfaceFrom( (void *)CLIENT_WINDOW_ICON.pixel_data, CLIENT_WINDOW_ICON.width, @@ -219,6 +220,7 @@ static int GLimp_SetMode(int mode, qboolean fullscreen, qboolean noborder) 0xFF000000, 0x00FF0000, 0x0000FF00, 0x000000FF #endif ); +#endif // If a window exists, note its display index if( SDL_window != NULL )