don't override dock icon on OSX
authorhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Sun, 1 May 2011 20:05:17 +0000 (20:05 +0000)
committerhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Sun, 1 May 2011 20:05:17 +0000 (20:05 +0000)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11087 d7cf8633-e32d-0410-b094-e92efae38249

vid_sdl.c

index 76cc2ac..aa76d6d 100644 (file)
--- a/vid_sdl.c
+++ b/vid_sdl.c
@@ -1850,6 +1850,15 @@ static SDL_Surface *VID_WrapSDL_SetVideoMode(int screenwidth, int screenheight,
        }
        return screen;
 }
+#elif defined(MACOSX)
+static SDL_Surface *VID_WrapSDL_SetVideoMode(int screenwidth, int screenheight, int screenbpp, int screenflags)
+{
+       SDL_Surface *screen = NULL;
+       SDL_WM_SetCaption( gamename, NULL );
+       screen = SDL_SetVideoMode(screenwidth, screenheight, screenbpp, screenflags);
+       // we don't use SDL_WM_SetIcon here because the icon in the .app should be used
+       return screen;
+}
 #else
 // Adding the OS independent XPM version --blub
 #include "darkplaces.xpm"