diff options
| author | Tony Wasserka <neobrainx@gmail.com> | 2014-08-06 09:02:20 +0200 |
|---|---|---|
| committer | Tony Wasserka <neobrainx@gmail.com> | 2014-08-06 09:02:20 +0200 |
| commit | cb178679f1420eae6811e3b901f02d292c20a9f9 (patch) | |
| tree | ca4173c547037f8e09ec7e9587ddd49a456b08e6 /Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp | |
| parent | 62cc22ac11d1b477b0a5a5d4baeecf1f5e8906b9 (diff) | |
| parent | fa5588e1036b4ca667335791348d6fcd285db117 (diff) | |
Merge pull request #737 from neobrain/master
Restore Wayland compatibility.
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp')
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp index fc797ebdec..366485daa2 100644 --- a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp +++ b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp @@ -5,6 +5,10 @@ #include "Common/Thread.h" #include "InputCommon/ControllerInterface/ControllerInterface.h" +#if USE_EGL +#include "DolphinWX/GLInterface/GLInterface.h" +#endif + #ifdef CIFACE_USE_XINPUT #include "InputCommon/ControllerInterface/XInput/XInput.h" #endif @@ -53,10 +57,15 @@ void ControllerInterface::Initialize() ciface::XInput::Init(m_devices); #endif #ifdef CIFACE_USE_XLIB - ciface::Xlib::Init(m_devices, m_hwnd); +#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 + } #endif #ifdef CIFACE_USE_OSX ciface::OSX::Init(m_devices, m_hwnd); |