mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-05-10 21:22:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move GLInterface around to remove VideoBackends dependency on DolphinWX

Browse source
This commit is contained in:
Pierre Bourdon 2014-08-01 23:21:03 -07:00
parent 7e83a0ea9b
commit 226a9c2392
30 changed files with 71 additions and 45 deletions
Source/Core/InputCommon/ControllerInterface
ControllerInterface.cpp

10
Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp
View file

@ -5,10 +5,6 @@
#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
@ -57,16 +53,10 @@ 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);