diff options
| author | Scott Moreau <oreaus@gmail.com> | 2014-01-19 09:11:07 -0700 |
|---|---|---|
| committer | Scott Moreau <oreaus@gmail.com> | 2014-01-19 10:36:20 -0700 |
| commit | 84aa98a5a4587629d6fa2bc9b3b07a5432c2e131 (patch) | |
| tree | e62a8f2ff2a0d6be51496f61a7e3622c1ad7f5b0 /Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp | |
| parent | 3b25bf2f14189d74cd7dd00b32d8b20b9df3e024 (diff) | |
wayland: Add bits required to run as a wayland client.
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp')
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp index 7287c380d5..493b8ba791 100644 --- a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp +++ b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp @@ -1,5 +1,9 @@ #include "ControllerInterface.h" +#if USE_EGL +#include "GLInterface/Platform.h" +#endif + #ifdef CIFACE_USE_XINPUT #include "XInput/XInput.h" #endif @@ -50,10 +54,16 @@ void ControllerInterface::Initialize() ciface::XInput::Init(m_devices); #endif #ifdef CIFACE_USE_XLIB +#if USE_EGL +if (GLWin.platform == EGL_PLATFORM_X11) { +#endif ciface::Xlib::Init(m_devices, m_hwnd); #ifdef CIFACE_USE_X11_XINPUT2 ciface::XInput2::Init(m_devices, m_hwnd); #endif +#if USE_EGL +} +#endif #endif #ifdef CIFACE_USE_OSX ciface::OSX::Init(m_devices, m_hwnd); |