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

dolphin-emu · Feb 5, 2013 · 708fed9 · 708fed9
1 parent f506783
commit 708fed9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.cpp b/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.cpp
@@ -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

diff --git 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