From 8091edb1ef39a78b724b30609e17407fafc9fe4e Mon Sep 17 00:00:00 2001 From: Ozkan Sezer Date: Sun, 14 Sep 2014 06:03:56 +0000 Subject: [PATCH] fix SDL2 compilation using g++ git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1031 af15c1b1-3010-417e-b628-4374ebc0bcbd --- Quake/pl_linux.c | 2 +- Quake/pl_win.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Quake/pl_linux.c b/Quake/pl_linux.c index cac819c1..9c447987 100644 --- a/Quake/pl_linux.c +++ b/Quake/pl_linux.c @@ -53,7 +53,7 @@ void PL_SetWindowIcon (void) colorkey = SDL_MapRGB(icon->format, 255, 0, 255); #if defined(USE_SDL2) SDL_SetColorKey(icon, SDL_TRUE, colorkey); - SDL_SetWindowIcon(VID_GetWindow(), icon); + SDL_SetWindowIcon((SDL_Window*) VID_GetWindow(), icon); #else SDL_SetColorKey(icon, SDL_SRCCOLORKEY, colorkey); SDL_WM_SetIcon(icon, NULL); diff --git a/Quake/pl_win.c b/Quake/pl_win.c index ad6d579c..a2127ae9 100644 --- a/Quake/pl_win.c +++ b/Quake/pl_win.c @@ -52,7 +52,7 @@ void PL_SetWindowIcon (void) SDL_VERSION(&wminfo.version); #if defined(USE_SDL2) - if (SDL_GetWindowWMInfo(VID_GetWindow(), &wminfo) != SDL_TRUE) + if (SDL_GetWindowWMInfo((SDL_Window*) VID_GetWindow(), &wminfo) != SDL_TRUE) return; /* wrong SDL version */ hwnd = wminfo.info.win.window;