From d4984ab991f186bd1d13293a83226078c40cd864 Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Thu, 21 Dec 2017 21:09:26 +0000 Subject: [PATCH] SDL: unbreak on more non-Vulkan platforms SDL/SDLMain.cpp:160:2: error: unknown type name 'SDL_SysWMinfo'; did you mean 'SDL_SysWMmsg'? SDL_SysWMinfo sysInfo; //Will hold our Window information ^~~~~~~~~~~~~ SDL_SysWMmsg SDL/SDLMain.cpp:433:2: error: unknown type name 'SDL_SysWMinfo'; did you mean 'SDL_SysWMmsg'? SDL_SysWMinfo sys_info{}; ^~~~~~~~~~~~~ SDL_SysWMmsg SDL/SDLMain.cpp:440:2: warning: expression result unused [-Wunused-value] Window x11_window = sys_info.info.x11.window; ^~~~~~ --- SDL/SDLMain.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/SDL/SDLMain.cpp b/SDL/SDLMain.cpp index f3202d24bf..04e011e314 100644 --- a/SDL/SDLMain.cpp +++ b/SDL/SDLMain.cpp @@ -36,15 +36,17 @@ SDLJoystick *joystick = NULL; #include "Common/Vulkan/VulkanDebug.h" #include "math.h" +#if !defined(__APPLE__) +#include "SDL_syswm.h" +#endif + #if defined(VK_USE_PLATFORM_XLIB_KHR) #include #include -#include "SDL_syswm.h" #elif defined(VK_USE_PLATFORM_XCB_KHR) #include #include #include -#include "SDL_syswm.h" #endif #if defined(USING_EGL)