diff options
| author | Scott Mansell <phiren@gmail.com> | 2015-07-04 23:43:36 +1200 |
|---|---|---|
| committer | Scott Mansell <phiren@gmail.com> | 2015-07-04 23:43:36 +1200 |
| commit | d2578000bbf5bddd52c18e162d5ae8aae5c93d1a (patch) | |
| tree | 80702ed2a17fd2aa7def9050b0f0b98b49ba8554 /Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp | |
| parent | 3bbb2ede9cc58af1dcdcb56d728e10622cf33dd6 (diff) | |
| parent | 8a50dc857bbfc86c41706a6f48770a6f78285628 (diff) | |
Merge branch 'stable'
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp')
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp | 6 |
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; } |