diff options
| author | Max Eliaser <max@meliaserlow.dyndns.tv> | 2013-07-09 22:49:58 -0800 |
|---|---|---|
| committer | Max Eliaser <max@meliaserlow.dyndns.tv> | 2013-07-20 13:58:02 -0800 |
| commit | 9fbc5ff27cef0acac37a5a5a1a2c0d060ec226e1 (patch) | |
| tree | 55d42dc4f8dd5f6b29aaef67cba5e9247f336606 /Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp | |
| parent | 2e92e3814e6590a3dc2a96fb37759b7eaa5df217 (diff) | |
Add X11 XInput2 input plugin, including MPX and with support for axis controls.
Based on the original XLib plugin, and thus shares some of its warts.
Diffstat (limited to 'Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp')
| -rw-r--r-- | Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp index 58e0653bbe..f0870a18a4 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp +++ b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp @@ -8,6 +8,9 @@ #endif #ifdef CIFACE_USE_XLIB #include "Xlib/Xlib.h" + #ifdef CIFACE_USE_X11_XINPUT2 + #include "Xlib/XInput2.h" + #endif #endif #ifdef CIFACE_USE_OSX #include "OSX/OSX.h" @@ -48,6 +51,9 @@ void ControllerInterface::Initialize() #endif #ifdef CIFACE_USE_XLIB ciface::Xlib::Init(m_devices, m_hwnd); + #ifdef CIFACE_USE_X11_XINPUT2 + ciface::XInput2::Init(m_devices, m_hwnd); + #endif #endif #ifdef CIFACE_USE_OSX ciface::OSX::Init(m_devices, m_hwnd); |