diff options
| author | Tony Wasserka <NeoBrainX@gmail.com> | 2014-08-04 18:26:03 +0200 |
|---|---|---|
| committer | Tony Wasserka <NeoBrainX@gmail.com> | 2014-08-04 18:26:03 +0200 |
| commit | 0d989ea82be5863ac0f1313302c296f7fb9bd92b (patch) | |
| tree | 21a9bbacefbe7cebb14b5ecdd1c3a792958f6e56 /Source/Core/InputCommon/ControllerInterface | |
| parent | 99dc069b9a19661cf529028f3d6d1aa5ee69cf29 (diff) | |
Restore Wayland compatibility.
It was broken by e15ec56bf0237 because it wasn't deemed important. However chances are people will eventually start using Dolphin on that configuration, so we shouldn't frivolously drop compatibility without good reason.
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface')
| -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); |