diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2014-08-03 21:14:59 -0700 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2014-08-03 21:14:59 -0700 |
| commit | e15ec56bf0237dba3db5cf969d68566af3a79194 (patch) | |
| tree | 110dba64d967a44be6c1699f9331320cd21e877d /Source/Core/InputCommon | |
| parent | 89adfba67bdf145ad0eae174cbe755f9aa7aa802 (diff) | |
| parent | 1fcf07f9cccf838894bf7a869ec0749cf2abbb2d (diff) | |
Merge pull request #716 from delroth/vertex-loader
Make vertex loader testable
Diffstat (limited to 'Source/Core/InputCommon')
| -rw-r--r-- | Source/Core/InputCommon/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp | 10 |
2 files changed, 10 insertions, 11 deletions
diff --git a/Source/Core/InputCommon/CMakeLists.txt b/Source/Core/InputCommon/CMakeLists.txt index 6b771c38e1..92fce634e3 100644 --- a/Source/Core/InputCommon/CMakeLists.txt +++ b/Source/Core/InputCommon/CMakeLists.txt @@ -4,6 +4,9 @@ set(SRCS ControllerEmu.cpp ControllerInterface/Device.cpp ControllerInterface/ExpressionParser.cpp) + +set(LIBS common) + if(WIN32) set(SRCS ${SRCS} ControllerInterface/DInput/DInput.cpp @@ -24,6 +27,7 @@ elseif(X11_FOUND) set(SRCS ${SRCS} ControllerInterface/Xlib/XInput2.cpp) endif() + set(LIBS ${LIBS} ${X11_LIBRARIES} ${XINPUT2_LIBRARIES}) elseif(ANDROID) set(SRCS ${SRCS} ControllerInterface/Android/Android.cpp) @@ -31,6 +35,11 @@ endif() if(SDL_FOUND OR SDL2_FOUND) set(SRCS ${SRCS} ControllerInterface/SDL/SDL.cpp) + if (SDL2_FOUND) + set(LIBS ${LIBS} ${SDL2_LIBRARY}) + elseif(SDL_FOUND) + set(LIBS ${LIBS} ${SDL_LIBRARY}) + endif() endif() -add_dolphin_library(inputcommon "${SRCS}" "") +add_dolphin_library(inputcommon "${SRCS}" "${LIBS}") diff --git a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp index a2534b56a1..fc797ebdec 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,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); |