From 83da5f2035012811a61cab57cc8e82e45ed16f84 Mon Sep 17 00:00:00 2001 From: Themaister Date: Fri, 29 Jun 2012 09:48:02 +0200 Subject: [PATCH] DRIVER_X11 appears to be defined on OSX. --- gfx/context/sdl_ctx.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gfx/context/sdl_ctx.c b/gfx/context/sdl_ctx.c index 62aa4a1aef..f3f591f862 100644 --- a/gfx/context/sdl_ctx.c +++ b/gfx/context/sdl_ctx.c @@ -263,7 +263,8 @@ bool gfx_ctx_key_pressed(int key) // 1.2 specific workaround for tiling WMs. In 1.3 we call GetSize directly, so we don't need to rely on // proper event handling (I hope). -#if !SDL_MODERN && defined(SDL_VIDEO_DRIVER_X11) +#if !SDL_MODERN && !defined(__APPLE__) && defined(SDL_VIDEO_DRIVER_X11) +// This X11 is set on OSX for some reason. static bool gfx_ctx_get_window_size(unsigned *width, unsigned *height) { SDL_SysWMinfo info; @@ -348,7 +349,7 @@ static void check_window_legacy(bool *quit, } } -#ifdef SDL_VIDEO_DRIVER_X11 +#if defined(SDL_VIDEO_DRIVER_X11) && !defined(__APPLE__) if (!*resize && !g_fullscreen) { unsigned new_width, new_height;