diff options
| author | Markus Wick <degasus@users.noreply.github.com> | 2016-09-06 10:26:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-06 10:26:26 +0200 |
| commit | 18030ebfb40eb4190663a501be93767453ca0950 (patch) | |
| tree | 82ce0e795612b6bc0d6d426ba94e284a4a6256fb /Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp | |
| parent | dddd88aace046ee2443db6eef52e7e7b4caf7287 (diff) | |
| parent | 928d05ec47a3dd46c6968088e934ff1555fc7fc5 (diff) | |
Merge pull request #4179 from magcius/xinput2-default
Remove the old Xlib backend
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp')
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp index f1e62e73cf..9f35040539 100644 --- a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp +++ b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp @@ -14,11 +14,8 @@ #include "InputCommon/ControllerInterface/DInput/DInput.h" #endif #ifdef CIFACE_USE_XLIB -#include "InputCommon/ControllerInterface/Xlib/Xlib.h" -#ifdef CIFACE_USE_X11_XINPUT2 #include "InputCommon/ControllerInterface/Xlib/XInput2.h" #endif -#endif #ifdef CIFACE_USE_OSX #include "InputCommon/ControllerInterface/OSX/OSX.h" #endif @@ -63,11 +60,8 @@ void ControllerInterface::Initialize(void* const hwnd) ciface::XInput::Init(); #endif #ifdef CIFACE_USE_XLIB - ciface::Xlib::Init(hwnd); -#ifdef CIFACE_USE_X11_XINPUT2 ciface::XInput2::Init(hwnd); #endif -#endif #ifdef CIFACE_USE_OSX ciface::OSX::Init(hwnd); #endif |