From 2ddd0c58c9ffc615fb46bb6a40745a5dd93961ec Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Mon, 20 Jan 2014 12:53:44 -0500 Subject: [PATCH] Patched to compile if Wayland is disabled via SDL_config.h (thanks, Martin!). Fixes Bugzilla #2351. --- src/video/wayland/SDL_waylandevents.c | 4 ++++ src/video/wayland/SDL_waylandmouse.c | 8 +++++--- src/video/wayland/SDL_waylandvideo.c | 4 ++++ src/video/wayland/SDL_waylandwindow.c | 4 ++++ 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/src/video/wayland/SDL_waylandevents.c b/src/video/wayland/SDL_waylandevents.c index 3af798d76ea52..61785742145de 100644 --- a/src/video/wayland/SDL_waylandevents.c +++ b/src/video/wayland/SDL_waylandevents.c @@ -21,6 +21,8 @@ #include "../../SDL_internal.h" +#if SDL_VIDEO_DRIVER_WAYLAND + #include "SDL_stdinc.h" #include "SDL_assert.h" @@ -380,4 +382,6 @@ void Wayland_display_destroy_input(SDL_VideoData *d) d->input = NULL; } +#endif /* SDL_VIDEO_DRIVER_WAYLAND */ + /* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/video/wayland/SDL_waylandmouse.c b/src/video/wayland/SDL_waylandmouse.c index 3609db6982a5c..ae634b62e2a3a 100644 --- a/src/video/wayland/SDL_waylandmouse.c +++ b/src/video/wayland/SDL_waylandmouse.c @@ -19,6 +19,10 @@ 3. This notice may not be removed or altered from any source distribution. */ +#include "../../SDL_internal.h" + +#if SDL_VIDEO_DRIVER_WAYLAND + #ifndef _GNU_SOURCE #define _GNU_SOURCE #endif @@ -31,7 +35,6 @@ #include #include -#include "../../SDL_internal.h" #include "../SDL_sysvideo.h" #include "SDL_mouse.h" @@ -44,7 +47,6 @@ #include "SDL_assert.h" -#if SDL_VIDEO_DRIVER_WAYLAND typedef struct { struct wl_buffer *buffer; @@ -407,4 +409,4 @@ Wayland_FiniMouse(void) mouse->WarpMouse = NULL; mouse->SetRelativeMouseMode = NULL; } -#endif +#endif /* SDL_VIDEO_DRIVER_WAYLAND */ diff --git a/src/video/wayland/SDL_waylandvideo.c b/src/video/wayland/SDL_waylandvideo.c index b8db46981f9d2..0d4ff196142dc 100644 --- a/src/video/wayland/SDL_waylandvideo.c +++ b/src/video/wayland/SDL_waylandvideo.c @@ -21,6 +21,8 @@ #include "../../SDL_internal.h" +#if SDL_VIDEO_DRIVER_WAYLAND + #include "SDL_video.h" #include "SDL_mouse.h" #include "SDL_stdinc.h" @@ -429,4 +431,6 @@ Wayland_VideoQuit(_THIS) _this->driverdata = NULL; } +#endif /* SDL_VIDEO_DRIVER_WAYLAND */ + /* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/video/wayland/SDL_waylandwindow.c b/src/video/wayland/SDL_waylandwindow.c index 090c494f0416b..3b3fc1a6d1bba 100644 --- a/src/video/wayland/SDL_waylandwindow.c +++ b/src/video/wayland/SDL_waylandwindow.c @@ -21,6 +21,8 @@ #include "../../SDL_internal.h" +#if SDL_VIDEO_DRIVER_WAYLAND && SDL_VIDEO_OPENGL_EGL + #include "../SDL_sysvideo.h" #include "../../events/SDL_windowevents_c.h" #include "../SDL_egl_c.h" @@ -236,4 +238,6 @@ void Wayland_DestroyWindow(_THIS, SDL_Window *window) } } +#endif /* SDL_VIDEO_DRIVER_WAYLAND && SDL_VIDEO_OPENGL_EGL */ + /* vi: set ts=4 sw=4 expandtab: */