diff options
| author | Scott Moreau <oreaus@gmail.com> | 2012-07-12 16:38:29 -0600 |
|---|---|---|
| committer | Scott Moreau <oreaus@gmail.com> | 2012-07-12 19:47:17 -0600 |
| commit | 80c15f21b4556394330918d32e30b6c1bbbce42e (patch) | |
| tree | 704b11358b27c67e3b5a8f7c9409e70a34f5cd31 /Source/Core/InputCommon | |
| parent | 8dd11bd1c0093b151aeb885fdb78b82ad806a176 (diff) | |
Add SDL2 support to build system.
Dolphin code already builds against SDL2 but the build system never
checks for SDL2, which is the what latest SDL is called now. SDL2
replaces SDL 1.3. This allows Dolphin to be build against SDL2, which
activates certain new features such as the haptic interface.
Diffstat (limited to 'Source/Core/InputCommon')
| -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 5edc171dc4..75ddc671a5 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.h +++ b/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.h @@ -5,23 +5,15 @@ #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 + #include <SDL_haptic.h> #define SDL_INIT_FLAGS SDL_INIT_JOYSTICK | SDL_INIT_HAPTIC - #ifdef _WIN32 - #include <SDL_haptic.h> - #else - #include <SDL/SDL_haptic.h> - #endif #else #define SDL_INIT_FLAGS SDL_INIT_JOYSTICK #endif |