From 6c197a8f6a39a979236fcc486f29b1ca9623ab9d Mon Sep 17 00:00:00 2001 From: Florent Castelli Date: Sat, 21 Jan 2017 02:35:46 +0100 Subject: cmake: Rename variable for libxi to X11_INPUT --- Source/Core/InputCommon/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Source/Core/InputCommon') diff --git a/Source/Core/InputCommon/CMakeLists.txt b/Source/Core/InputCommon/CMakeLists.txt index 648d7113b6..7376dcec1d 100644 --- a/Source/Core/InputCommon/CMakeLists.txt +++ b/Source/Core/InputCommon/CMakeLists.txt @@ -27,7 +27,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} -- cgit v1.2.3 From 59fb8042d1b5646b7f1d0b4cff42ed6fc421f980 Mon Sep 17 00:00:00 2001 From: Florent Castelli Date: Sat, 21 Jan 2017 02:37:01 +0100 Subject: cmake: Add XInput file to the InputCommon target --- Source/Core/InputCommon/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'Source/Core/InputCommon') diff --git a/Source/Core/InputCommon/CMakeLists.txt b/Source/Core/InputCommon/CMakeLists.txt index 7376dcec1d..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) -- cgit v1.2.3