summaryrefslogtreecommitdiff
path: root/src/sdl/sdl_glimp.c
diff options
context:
space:
mode:
authorZack Middleton <zturtleman@gmail.com>2013-10-19 01:54:58 -0500
committerTim Angus <tim@ngus.net>2014-08-28 11:03:29 +0100
commit836d4d84731c9b60b8261e7b05b3e056ab4d0c38 (patch)
treef6b9ab7e0fdf59ec4f7ace1f4a179e045974cedb /src/sdl/sdl_glimp.c
parent06b38d40f5da3793726e0ebf0358d7a4d261ef49 (diff)
Use bundle icon on Mac OS X instead of internal 32x32 window icon
Diffstat (limited to 'src/sdl/sdl_glimp.c')
-rw-r--r--src/sdl/sdl_glimp.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/sdl/sdl_glimp.c b/src/sdl/sdl_glimp.c
index 0c2a2e7e..bfd8efa9 100644
--- a/src/sdl/sdl_glimp.c
+++ b/src/sdl/sdl_glimp.c
@@ -215,6 +215,7 @@ static int GLimp_SetMode( qboolean failSafe, qboolean fullscreen, qboolean nobor
if ( r_allowResize->integer )
flags |= SDL_WINDOW_RESIZABLE;
+#ifdef USE_ICON
icon = SDL_CreateRGBSurfaceFrom(
(void *)CLIENT_WINDOW_ICON.pixel_data,
CLIENT_WINDOW_ICON.width,
@@ -227,6 +228,7 @@ static int GLimp_SetMode( qboolean failSafe, qboolean fullscreen, qboolean nobor
0xFF000000, 0x00FF0000, 0x0000FF00, 0x000000FF
#endif
);
+#endif
// If a window exists, note its display index
if( SDL_window != NULL )