Patched to compile if Wayland is disabled via SDL_config.h (thanks, Martin!).

Fixes Bugzilla #2351.
This commit is contained in:
Ryan C. Gordon 2014-01-20 12:53:44 -05:00
parent 9e90acdfcf
commit 2ddd0c58c9
4 changed files with 17 additions and 3 deletions

View File

@ -21,6 +21,8 @@
#include "../../SDL_internal.h" #include "../../SDL_internal.h"
#if SDL_VIDEO_DRIVER_WAYLAND
#include "SDL_stdinc.h" #include "SDL_stdinc.h"
#include "SDL_assert.h" #include "SDL_assert.h"
@ -380,4 +382,6 @@ void Wayland_display_destroy_input(SDL_VideoData *d)
d->input = NULL; d->input = NULL;
} }
#endif /* SDL_VIDEO_DRIVER_WAYLAND */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

View File

@ -19,6 +19,10 @@
3. This notice may not be removed or altered from any source distribution. 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 #ifndef _GNU_SOURCE
#define _GNU_SOURCE #define _GNU_SOURCE
#endif #endif
@ -31,7 +35,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <limits.h> #include <limits.h>
#include "../../SDL_internal.h"
#include "../SDL_sysvideo.h" #include "../SDL_sysvideo.h"
#include "SDL_mouse.h" #include "SDL_mouse.h"
@ -44,7 +47,6 @@
#include "SDL_assert.h" #include "SDL_assert.h"
#if SDL_VIDEO_DRIVER_WAYLAND
typedef struct { typedef struct {
struct wl_buffer *buffer; struct wl_buffer *buffer;
@ -407,4 +409,4 @@ Wayland_FiniMouse(void)
mouse->WarpMouse = NULL; mouse->WarpMouse = NULL;
mouse->SetRelativeMouseMode = NULL; mouse->SetRelativeMouseMode = NULL;
} }
#endif #endif /* SDL_VIDEO_DRIVER_WAYLAND */

View File

@ -21,6 +21,8 @@
#include "../../SDL_internal.h" #include "../../SDL_internal.h"
#if SDL_VIDEO_DRIVER_WAYLAND
#include "SDL_video.h" #include "SDL_video.h"
#include "SDL_mouse.h" #include "SDL_mouse.h"
#include "SDL_stdinc.h" #include "SDL_stdinc.h"
@ -429,4 +431,6 @@ Wayland_VideoQuit(_THIS)
_this->driverdata = NULL; _this->driverdata = NULL;
} }
#endif /* SDL_VIDEO_DRIVER_WAYLAND */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

View File

@ -21,6 +21,8 @@
#include "../../SDL_internal.h" #include "../../SDL_internal.h"
#if SDL_VIDEO_DRIVER_WAYLAND && SDL_VIDEO_OPENGL_EGL
#include "../SDL_sysvideo.h" #include "../SDL_sysvideo.h"
#include "../../events/SDL_windowevents_c.h" #include "../../events/SDL_windowevents_c.h"
#include "../SDL_egl_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: */ /* vi: set ts=4 sw=4 expandtab: */