summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp
diff options
context:
space:
mode:
authorskidau <skidau@gmail.com>2015-07-03 10:28:08 +1000
committerskidau <skidau@gmail.com>2015-07-03 10:28:08 +1000
commit8a50dc857bbfc86c41706a6f48770a6f78285628 (patch)
tree3c7ac1088404678a1608fa0ff3ddea8b79c5ef1f /Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp
parent6a33f174de618dc698ceba02e792cc6b2dba9732 (diff)
parent77183899e0526a343b8429cf04a1c07b31aafc34 (diff)
Merge pull request #2681 from phire/evdev-stable
Linux: Add an evdev based controller backend, to replace SDL.
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp')
-rw-r--r--Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp
index 6b8b11fd3a..0631069e16 100644
--- a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp
@@ -26,6 +26,9 @@
#ifdef CIFACE_USE_ANDROID
#include "InputCommon/ControllerInterface/Android/Android.h"
#endif
+#ifdef CIFACE_USE_EVDEV
+ #include "InputCommon/ControllerInterface/evdev/evdev.h"
+#endif
using namespace ciface::ExpressionParser;
@@ -69,6 +72,9 @@ void ControllerInterface::Initialize(void* const hwnd)
#ifdef CIFACE_USE_ANDROID
ciface::Android::Init(m_devices);
#endif
+#ifdef CIFACE_USE_EVDEV
+ ciface::evdev::Init(m_devices);
+#endif
m_is_init = true;
}