piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-14 21:37:52 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Restore Wayland compatibility.

Browse Source 
It was broken by e15ec56bf0 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.
This commit is contained in:
Tony Wasserka 2014-08-04 18:26:03 +02:00
parent 99dc069b9a
commit 0d989ea82b
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp
View File

@ -5,6 +5,10 @@
#include "Common/Thread.h" #include "Common/Thread.h"
#include "InputCommon/ControllerInterface/ControllerInterface.h" #include "InputCommon/ControllerInterface/ControllerInterface.h"
#if USE_EGL
#include "DolphinWX/GLInterface/GLInterface.h"
#endif
#ifdef CIFACE_USE_XINPUT #ifdef CIFACE_USE_XINPUT
#include "InputCommon/ControllerInterface/XInput/XInput.h" #include "InputCommon/ControllerInterface/XInput/XInput.h"
#endif #endif
@ -53,10 +57,15 @@ void ControllerInterface::Initialize()
ciface::XInput::Init(m_devices); ciface::XInput::Init(m_devices);
#endif #endif
#ifdef CIFACE_USE_XLIB #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 #ifdef CIFACE_USE_X11_XINPUT2
ciface::XInput2::Init(m_devices, m_hwnd); ciface::XInput2::Init(m_devices, m_hwnd);
#endif #endif
}
#endif #endif
#ifdef CIFACE_USE_OSX #ifdef CIFACE_USE_OSX
ciface::OSX::Init(m_devices, m_hwnd); ciface::OSX::Init(m_devices, m_hwnd);