From 8b6f479fea2a6419a5f7267be89d6f323fff182c Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Thu, 25 Apr 2013 00:26:17 -0700 Subject: [PATCH] Fixed bug 1582 - Allow disabling SDL_VIDEO_DRIVER_WINDOWS Marcus von Appen Trying to build SDL 2.x (HG) on Win32 platforms with either VS.NET or MinGW requires one to have the video subsystem and SDL_VIDEO_DRIVER_WINDOWS flag enabled due to the helper window creation routines. The attached patch changes the helper window creation behaviour, so that one can build SDL2 without the video subsystem or Windows video drivers on Win32 platforms. --- src/SDL.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/SDL.c b/src/SDL.c index 829da1e7b..c0b87caba 100644 --- a/src/SDL.c +++ b/src/SDL.c @@ -36,7 +36,7 @@ extern void SDL_StartTicks(void); extern int SDL_TimerInit(void); extern void SDL_TimerQuit(void); #endif -#if defined(__WIN32__) +#if SDL_VIDEO_DRIVER_WINDOWS extern int SDL_HelperWindowCreate(void); extern int SDL_HelperWindowDestroy(void); #endif @@ -200,7 +200,7 @@ SDL_Init(Uint32 flags) /* Clear the error message */ SDL_ClearError(); -#if defined(__WIN32__) +#if SDL_VIDEO_DRIVER_WINDOWS if (SDL_HelperWindowCreate() < 0) { return -1; } @@ -310,7 +310,7 @@ SDL_Quit(void) SDL_bInMainQuit = SDL_TRUE; /* Quit all subsystems */ -#if defined(__WIN32__) +#if SDL_VIDEO_DRIVER_WINDOWS SDL_HelperWindowDestroy(); #endif SDL_QuitSubSystem(SDL_INIT_EVERYTHING);