fly/flightgear
1
0
Fork 0
Code Activity

Linux fixes for HID-input

Browse source
This commit is contained in:
James Turner 2017-12-20 04:01:32 -08:00
parent edc1d63b26
commit 407a6d4b3e
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
3rdparty/hidapi/CMakeLists.txt vendored
View file

@ -21,6 +21,9 @@ add_library(hidapi STATIC
${HIDAPI_SOURCES} ${HIDAPI_SOURCES}
) )
target_link_libraries(hidapi ${UDEV_LIBRARIES})
target_include_directories(hidapi PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/hidapi) target_include_directories(hidapi PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/hidapi)
target_include_directories(hidapi PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) target_include_directories(hidapi PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})

2
src/Input/CMakeLists.txt
View file

@ -73,7 +73,7 @@ endif()
if (ENABLE_HID_INPUT) if (ENABLE_HID_INPUT)
if (COMMAND flightgear_test) if (COMMAND flightgear_test)
set(HID_INPUT_TEST_SOURCES test_hidinput.cxx FGEventInput.cxx set(HID_INPUT_TEST_SOURCES test_hidinput.cxx FGEventInput.cxx
FGCommonInput.cxx FGDEviceConfigurationMap.cxx) FGCommonInput.cxx FGDeviceConfigurationMap.cxx)
flightgear_test(hidinput "${HID_INPUT_TEST_SOURCES}") flightgear_test(hidinput "${HID_INPUT_TEST_SOURCES}")
target_link_libraries(hidinput ${EVENT_INPUT_LIBRARIES} hidapi) target_link_libraries(hidinput ${EVENT_INPUT_LIBRARIES} hidapi)

2
src/Input/FGLinuxEventInput.hxx
View file

@ -42,7 +42,7 @@ struct FGLinuxEventData : public FGEventData {
class FGLinuxInputDevice : public FGInputDevice { class FGLinuxInputDevice : public FGInputDevice {
public: public:
FGLinuxInputDevice(); FGLinuxInputDevice();
FGLinuxInputDevice( std::string name, std::string devname ); FGLinuxInputDevice( std::string name, std::string devname, std::string aSerial );
virtual ~FGLinuxInputDevice(); virtual ~FGLinuxInputDevice();
virtual void Open(); virtual void Open();