ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #737 from neobrain/master 

Restore Wayland compatibility.
This commit is contained in:
Tony Wasserka 2014-08-06 09:02:20 +02:00
parent 62cc22ac11 fa5588e103
commit cb178679f1
2 changed files with 14 additions and 2 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);

5
Source/UnitTests/VideoCommon/CMakeLists.txt
View File

@ -1 +1,4 @@
add_dolphin_test(VertexLoaderTest VertexLoaderTest.cpp) # This test currently doesn't link correctly when EGL is enabled due to issues with the GLInterface design
if(NOT USE_EGL)
add_dolphin_test(VertexLoaderTest VertexLoaderTest.cpp)
endif()