mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-04-09 18:45:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Re-add hack to use SDL/SDL.h ifndef _WIN32.

Browse Source 
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.
This commit is contained in:
Scott Moreau 2012-07-14 16:58:31 -06:00
parent d34418100b
commit 0e1348c839
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.h
View File

@ -5,14 +5,22 @@
#include <list> #include <list>
#include <SDL.h> #ifdef _WIN32
#include <SDL.h>
#else
#include <SDL/SDL.h>
#endif
#if SDL_VERSION_ATLEAST(1, 3, 0) #if SDL_VERSION_ATLEAST(1, 3, 0)
#define USE_SDL_HAPTIC #define USE_SDL_HAPTIC
#endif #endif
#ifdef USE_SDL_HAPTIC #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 #define SDL_INIT_FLAGS SDL_INIT_JOYSTICK | SDL_INIT_HAPTIC
#else #else
#define SDL_INIT_FLAGS SDL_INIT_JOYSTICK #define SDL_INIT_FLAGS SDL_INIT_JOYSTICK