Home Explore Help
Sign In
cpp
/
urho3d
mirror of https://github.com/urho3d/urho3d.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

Merge remote-tracking branch 'GKR/bugfix/sdl-wayland-undefined-references'

Lasse Öörni 9 years ago
parent
aa1199ebf1 20c31802db
commit
0631a8a9e2
2 changed files with 4 additions and 0 deletions
Split View Show Diff Stats
  1. 1 0
      Source/ThirdParty/SDL/src/video/wayland/SDL_waylanddyn.h
  2. 3 0
      Source/ThirdParty/SDL/src/video/wayland/SDL_waylandsym.h

+ 1 - 0
Source/ThirdParty/SDL/src/video/wayland/SDL_waylanddyn.h
View File 

@@ -79,6 +79,7 @@ void SDL_WAYLAND_UnloadSymbols(void);
 
 #define wl_proxy_get_user_data (*WAYLAND_wl_proxy_get_user_data)
 
 #define wl_proxy_add_listener (*WAYLAND_wl_proxy_add_listener)
 
 #define wl_proxy_marshal_constructor (*WAYLAND_wl_proxy_marshal_constructor)
 
+#define wl_proxy_marshal_constructor_versioned (*WAYLAND_wl_proxy_marshal_constructor_versioned)
 
 
 #define wl_seat_interface (*WAYLAND_wl_seat_interface)
 
 #define wl_surface_interface (*WAYLAND_wl_surface_interface)

+ 3 - 0
Source/ThirdParty/SDL/src/video/wayland/SDL_waylandsym.h
View File 

@@ -55,6 +55,9 @@ SDL_WAYLAND_SYM(void, wl_list_insert_list, (struct wl_list *, struct wl_list *))
 
 SDL_WAYLAND_MODULE(WAYLAND_CLIENT_1_4)
 
 SDL_WAYLAND_SYM(struct wl_proxy *, wl_proxy_marshal_constructor, (struct wl_proxy *, uint32_t opcode, const struct wl_interface *interface, ...))
 
 
+SDL_WAYLAND_MODULE(WAYLAND_CLIENT_1_10)
 
+SDL_WAYLAND_SYM(struct wl_proxy *, wl_proxy_marshal_constructor_versioned, (struct wl_proxy *proxy, uint32_t opcode, const struct wl_interface *interface, uint32_t version, ...))
 
+
 
 SDL_WAYLAND_INTERFACE(wl_seat_interface)
 
 SDL_WAYLAND_INTERFACE(wl_surface_interface)
 
 SDL_WAYLAND_INTERFACE(wl_shm_pool_interface)