diff --git a/OpenRGB.pro b/OpenRGB.pro index a1f52a79b..f168de523 100644 --- a/OpenRGB.pro +++ b/OpenRGB.pro @@ -299,6 +299,7 @@ win32:contains(QMAKE_TARGET.arch, x86) { # Linux specific project configuration #----------------------------------------------- unix:INCLUDEPATH += \ + dependencies/hidapi \ unix:HEADERS += \ i2c_smbus/i2c_smbus_linux.h \ @@ -307,19 +308,9 @@ unix:HEADERS += \ unix:LIBS += \ -lusb-1.0 \ -lstdc++fs \ - -packagesExist(hidapi-libusb){ - unix:LIBS += -lhidapi-libusb -} else { - packagesExist(hidapi) { - unix:LIBS += -lhidapi - } else { - unix:LIBS += -lhidapi-libusb - } -} - unix:SOURCES += \ + dependencies/hidapi/hid_win.c \ i2c_smbus/i2c_smbus_linux.cpp \ serial_port/find_usb_serial_port_linux.cpp \ RGBController/OpenRazerDetect.cpp \ diff --git a/dependencies/hidapi/hid_win.c b/dependencies/hidapi/hid_win.c index f4e86be6e..0e2ab1687 100644 --- a/dependencies/hidapi/hid_win.c +++ b/dependencies/hidapi/hid_win.c @@ -96,7 +96,7 @@ struct hid_device_ { int blocking; /* boolean */ /* Read thread objects */ - HANDLE thread; + //HANDLE thread; //pthread_mutex_t mutex; /* Protects input_reports */ //pthread_cond_t condition; //pthread_barrier_t barrier; /* Ensures correct startup sequence */