ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Clean up SDL includes a bit. Maybe fix an SDL2 problem.

This commit is contained in:
Jordan Woyak 2013-02-05 15:32:13 -06:00
parent f506783c37
commit 708fed92c8
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.cpp
View File

@ -325,7 +325,13 @@ bool Joystick::UpdateOutput()
std::string Joystick::GetName() const
{
return StripSpaces(SDL_JoystickName(m_sdl_index));
return StripSpaces(
#if SDL_VERSION_ATLEAST(2, 0, 0)
SDL_JoystickNameForIndex(m_sdl_index)
#else
SDL_JoystickName(m_sdl_index)
#endif
);
}
std::string Joystick::GetSource() const

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

@ -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