src/video/wayland/SDL_waylandtouch.c
changeset 8104 2e4f1bd21196
parent 8082 5b83ad3f01ac
child 8149 681eb46b8ac4
     1.1 --- a/src/video/wayland/SDL_waylandtouch.c	Wed Jan 08 14:53:08 2014 -0500
     1.2 +++ b/src/video/wayland/SDL_waylandtouch.c	Thu Jan 09 13:56:21 2014 -0300
     1.3 @@ -21,7 +21,7 @@
     1.4  
     1.5  /* Contributed by Thomas Perl <thomas.perl@jollamobile.com> */
     1.6  
     1.7 -#include "SDL_config.h"
     1.8 +#include "../../SDL_internal.h"
     1.9  
    1.10  #ifdef SDL_VIDEO_DRIVER_WAYLAND_QT_TOUCH
    1.11  
    1.12 @@ -118,6 +118,7 @@
    1.13  {
    1.14  }
    1.15  
    1.16 +
    1.17  /* wayland-qt-touch-extension.c BEGINS */
    1.18  
    1.19  static const struct qt_touch_extension_listener touch_listener = {
    1.20 @@ -183,13 +184,23 @@
    1.21  
    1.22  /* wayland-qt-surface-extension.c BEGINS */
    1.23  extern const struct wl_interface qt_extended_surface_interface;
    1.24 +#ifndef SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC
    1.25  extern const struct wl_interface wl_surface_interface;
    1.26 +#endif
    1.27  
    1.28  static const struct wl_interface *qt_surface_extension_types[] = {
    1.29      NULL,
    1.30      NULL,
    1.31      &qt_extended_surface_interface,
    1.32 +#ifdef SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC
    1.33 +    /* FIXME: Set this dynamically to (*WAYLAND_wl_surface_interface) ? 
    1.34 +     * The value comes from auto generated code and does 
    1.35 +     * not appear to actually be used anywhere
    1.36 +     */
    1.37 +    NULL, 
    1.38 +#else
    1.39      &wl_surface_interface,
    1.40 +#endif    
    1.41  };
    1.42  
    1.43  static const struct wl_message qt_surface_extension_requests[] = {