From 0e1348c839cd55a2321dda3a47f13dd5ee7075ef Mon Sep 17 00:00:00 2001 From: Scott Moreau Date: Sat, 14 Jul 2012 16:58:31 -0600 Subject: [PATCH] Re-add hack to use SDL/SDL.h ifndef _WIN32. The correct convention is to use #include SDL.h in all cases but we have to do this so Externals/SDL builds, which isn't in the best shape. --- .../InputCommon/Src/ControllerInterface/SDL/SDL.h | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.h b/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.h index fa770c403d..139e9f232d 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.h +++ b/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.h @@ -5,14 +5,22 @@ #include -#include +#ifdef _WIN32 + #include +#else + #include +#endif #if SDL_VERSION_ATLEAST(1, 3, 0) #define USE_SDL_HAPTIC #endif #ifdef USE_SDL_HAPTIC - #include + #ifdef _WIN32 + #include + #else + #include + #endif #define SDL_INIT_FLAGS SDL_INIT_JOYSTICK | SDL_INIT_HAPTIC #else #define SDL_INIT_FLAGS SDL_INIT_JOYSTICK