From 7c12ccb67e964e24bccb841a6c9a13daf8b5f771 Mon Sep 17 00:00:00 2001 From: divverent Date: Thu, 20 Dec 2012 11:05:48 +0000 Subject: [PATCH] only include SDL_syswm.h if really necessary git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11860 d7cf8633-e32d-0410-b094-e92efae38249 --- vid_sdl.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/vid_sdl.c b/vid_sdl.c index 9484f6c2..aed184b1 100644 --- a/vid_sdl.c +++ b/vid_sdl.c @@ -18,7 +18,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #undef WIN32_LEAN_AND_MEAN //hush a warning, SDL.h redefines this #include -#include #include #include "quakedef.h" @@ -1767,6 +1766,11 @@ static SDL_Surface *VID_WrapSDL_SetVideoMode(int screenwidth, int screenheight, // Adding the OS independent XPM version --blub #include "darkplaces.xpm" #include "nexuiz.xpm" +#if SDL_MAJOR_VERSION == 1 +#if SDL_VIDEO_DRIVER_X11 && !SDL_VIDEO_DRIVER_QUARTZ +#include +#endif +#endif static SDL_Surface *icon = NULL; static SDL_Surface *VID_WrapSDL_SetVideoMode(int screenwidth, int screenheight, int screenbpp, int screenflags) { -- 2.39.2