diff options
| author | Lioncash <mathew1800@gmail.com> | 2014-08-21 14:14:54 -0400 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2014-08-21 14:14:54 -0400 |
| commit | f17dcd201906c33074d5979390768ed74eb9709f (patch) | |
| tree | ab06743826b4f8a6c7e90ad32edc7b75a6410a6e /Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp | |
| parent | cf82972961baa120675fa038b82cf99c8404ab1b (diff) | |
| parent | 6dbafa92389f52c6bd0140b4525b563fe74af0f2 (diff) | |
Merge pull request #764 from magcius/new-nogui-2
Rewrite GLInterface
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp')
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp index 366485daa2..6d9d3b82a2 100644 --- a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp +++ b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp @@ -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,15 +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); + ciface::Xlib::Init(m_devices, m_hwnd); #ifdef CIFACE_USE_X11_XINPUT2 - ciface::XInput2::Init(m_devices, m_hwnd); + ciface::XInput2::Init(m_devices, m_hwnd); #endif - } #endif #ifdef CIFACE_USE_OSX ciface::OSX::Init(m_devices, m_hwnd); |