piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 14:49:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4699 from Orphis/cmake_cleanup

Browse Source 
CMake cleanup (but wait, there's more!)
This commit is contained in:
Matthew Parlane
2017-01-21 16:38:09 +13:00
committed by GitHub
parent 57e85d9218 c3e876b6be
commit 7ebfd357b5
9 changed files with 93 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/InputCommon/CMakeLists.txt
View File

@ -10,6 +10,7 @@ if(WIN32)
ControllerInterface/DInput/DInput.cpp
ControllerInterface/DInput/DInputJoystick.cpp
ControllerInterface/DInput/DInputKeyboardMouse.cpp
ControllerInterface/DInput/XInputFilter.cpp
ControllerInterface/XInput/XInput.cpp
ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp)
elseif(APPLE)
@ -27,7 +28,7 @@ elseif(APPLE)
elseif(X11_FOUND)
set(SRCS ${SRCS}
ControllerInterface/Xlib/XInput2.cpp)
set(LIBS ${LIBS} ${X11_LIBRARIES} ${XINPUT2_LIBRARIES})
set(LIBS ${LIBS} ${X11_LIBRARIES} ${X11_INPUT_LIBRARIES})
elseif(ANDROID)
add_definitions(-DCIFACE_USE_ANDROID)
set(SRCS ${SRCS}