diff options
| author | Jordan Woyak <jordan.woyak@gmail.com> | 2013-02-05 15:32:13 -0600 |
|---|---|---|
| committer | Ryan Houdek <Sonicadvance1@gmail.com> | 2013-02-12 14:02:43 -0600 |
| commit | 1e64c38998a8731ef38b96fd44e1102f4a783264 (patch) | |
| tree | be39e70c81d11a686da43c28124d79f6ae630587 /Source/Core/InputCommon/Src/ControllerInterface | |
| parent | 46f94203b735bbcc242cb324ac7a45c9b204b067 (diff) | |
Clean up SDL includes a bit. Maybe fix an SDL2 problem.
Conflicts:
Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.cpp
Diffstat (limited to 'Source/Core/InputCommon/Src/ControllerInterface')
| -rw-r--r-- | Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.h | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.h b/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.h index 139e9f232d..fa770c403d 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.h +++ b/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.h @@ -5,22 +5,14 @@ #include <list> -#ifdef _WIN32 - #include <SDL.h> -#else - #include <SDL/SDL.h> -#endif +#include <SDL.h> #if SDL_VERSION_ATLEAST(1, 3, 0) #define USE_SDL_HAPTIC #endif #ifdef USE_SDL_HAPTIC - #ifdef _WIN32 - #include <SDL_haptic.h> - #else - #include <SDL/SDL_haptic.h> - #endif + #include <SDL_haptic.h> #define SDL_INIT_FLAGS SDL_INIT_JOYSTICK | SDL_INIT_HAPTIC #else #define SDL_INIT_FLAGS SDL_INIT_JOYSTICK |