diff options
| author | Matthew Parlane <parlane@gmail.com> | 2017-01-21 16:38:09 +1300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-21 16:38:09 +1300 |
| commit | 7ebfd357b500dbb4ecf576c9e9875013a2f31089 (patch) | |
| tree | d8b5c3459a7762a53e81c971a4c5a269fef1b4a0 /Source/Core | |
| parent | 57e85d921885b5356ba5a5fba850ae28a6f3b690 (diff) | |
| parent | c3e876b6befe735915245a2b6157f65d3bf509a4 (diff) | |
Merge pull request #4699 from Orphis/cmake_cleanup
CMake cleanup (but wait, there's more!)
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/InputCommon/CMakeLists.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/Core/InputCommon/CMakeLists.txt b/Source/Core/InputCommon/CMakeLists.txt index 648d7113b6..42907c2941 100644 --- a/Source/Core/InputCommon/CMakeLists.txt +++ b/Source/Core/InputCommon/CMakeLists.txt @@ -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} |