From ca3e6c7efbc95bff6661c3fe6118e90793558c02 Mon Sep 17 00:00:00 2001 From: havoc Date: Sun, 1 May 2011 20:05:17 +0000 Subject: [PATCH] don't override dock icon on OSX git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11087 d7cf8633-e32d-0410-b094-e92efae38249 ::stable-branch::merge=63f8870823e80484fe6e58a3738c2e681860c7f1 --- vid_sdl.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/vid_sdl.c b/vid_sdl.c index 76cc2ac4..aa76d6df 100644 --- 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" -- 2.39.2