From 836d4d84731c9b60b8261e7b05b3e056ab4d0c38 Mon Sep 17 00:00:00 2001
From: Zack Middleton <zturtleman@gmail.com>
Date: Sat, 19 Oct 2013 01:54:58 -0500
Subject: Use bundle icon on Mac OS X instead of internal 32x32 window icon

---
 src/sdl/sdl_glimp.c | 2 ++
 1 file changed, 2 insertions(+)

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 )
-- 
cgit