diff options
| author | Scott Moreau <oreaus@gmail.com> | 2012-07-14 16:58:31 -0600 |
|---|---|---|
| committer | Scott Moreau <oreaus@gmail.com> | 2012-07-14 20:50:58 -0600 |
| commit | 0e1348c839cd55a2321dda3a47f13dd5ee7075ef (patch) | |
| tree | 33cae4ec75c09156b04c06d4e23cfb1ea6033a9c /Source/Core | |
| parent | d34418100be19fdbdf112febde3303edd48c9247 (diff) | |
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.
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.h | 12 |
1 files 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 <list> -#include <SDL.h> +#ifdef _WIN32 + #include <SDL.h> +#else + #include <SDL/SDL.h> +#endif #if SDL_VERSION_ATLEAST(1, 3, 0) #define USE_SDL_HAPTIC #endif #ifdef USE_SDL_HAPTIC - #include <SDL_haptic.h> + #ifdef _WIN32 + #include <SDL_haptic.h> + #else + #include <SDL/SDL_haptic.h> + #endif #define SDL_INIT_FLAGS SDL_INIT_JOYSTICK | SDL_INIT_HAPTIC #else #define SDL_INIT_FLAGS SDL_INIT_JOYSTICK |