Merge pull request #56 from kodi-game/remove-sdl

Remove SDL driver
a1rwulf · Oct 12, 2016 · 8b8ea38 · 8b8ea38
2 parents 8a88254 + 1272305
commit 8b8ea38
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 309 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -83,23 +83,6 @@ if("${CORE_SYSTEM_NAME}" STREQUAL "darwin" OR "${CORE_SYSTEM_NAME}" STREQUAL "os
   list(APPEND DEPLIBS ${COCOA_LIBRARY})
 endif()
 
-# --- SDL ----------------------------------------------------------------------
-
-if(NOT "${CORE_SYSTEM_NAME}" STREQUAL "windows")
-  find_package(Sdl)
-
-  if(SDL_FOUND)
-    include_directories(${SDL_INCLUDE_DIRS})
-
-    add_definitions(-DHAVE_SDL)
-
-    list(APPEND JOYSTICK_SOURCES src/api/sdl/JoystickInterfaceSDL.cpp
-                                 src/api/sdl/JoystickSDL.cpp)
-
-    list(APPEND DEPLIBS ${SDL_LIBRARIES})
-  endif()
-endif()
-
 # --- Linux Joystick API -------------------------------------------------------
 
 check_include_files(linux/joystick.h HAVE_LINUX_JOYSTICK_H)

diff --git a/src/api/JoystickManager.cpp b/src/api/JoystickManager.cpp
@@ -31,9 +31,6 @@
 #if defined(HAVE_LINUX_JOYSTICK)
   #include "linux/JoystickInterfaceLinux.h"
 #endif
-#if defined(HAVE_SDL)
-  #include "sdl/JoystickInterfaceSDL.h"
-#endif
 #if defined(HAVE_COCOA)
   #include "cocoa/JoystickInterfaceCocoa.h"
 #endif
@@ -118,8 +115,6 @@ bool CJoystickManager::Initialize(IScannerCallback* scanner)
   m_interfaces.push_back(new CJoystickInterfaceLinux);
 #elif defined(HAVE_UDEV)
   m_interfaces.push_back(new CJoystickInterfaceUdev);
-#elif defined(HAVE_SDL)
-  m_interfaces.push_back(new CJoystickInterfaceSDL);
 #endif
 
   // OSX

diff --git a/src/api/sdl/JoystickInterfaceSDL.cpp b/src/api/sdl/JoystickInterfaceSDL.cpp
diff --git a/src/api/sdl/JoystickInterfaceSDL.h b/src/api/sdl/JoystickInterfaceSDL.h
diff --git a/src/api/sdl/JoystickSDL.cpp b/src/api/sdl/JoystickSDL.cpp
diff --git a/src/api/sdl/JoystickSDL.h b/src/api/sdl/JoystickSDL.h