Browse Source

Merge patch from Giulio Paci that uses libhidapi if libhidapi-libusb does not exist. Fixes compilation on FreeBSD.

master
Brad Parker 8 years ago
parent
commit
37e341350c
  1. 9
      main.cpp
  2. 11
      msi-keyboard.pro

9
main.cpp

@ -188,7 +188,7 @@ Example:
return 1;
}else{
Keyboard k;
if(keyboardOptions.colorSet) {
for(int i = 0; i < keyboardOptions.colorOptions.count(); ++i) {
ColorOption *colorOption = keyboardOptions.colorOptions.at(i);
@ -200,13 +200,8 @@ Example:
if(keyboardOptions.modeSet) {
k.setMode(keyboardOptions.modeOption);
}
}
/*k.setMode(MODE_NORMAL);
k.setColor(REGION_LEFT, COLOR_RED, INTENSITY_HIGH);
k.setColor(REGION_MIDDLE, COLOR_PURPLE, INTENSITY_HIGH);
k.setColor(REGION_RIGHT, COLOR_SKY, INTENSITY_HIGH);*/
}
return 0;
}

11
msi-keyboard.pro

@ -10,5 +10,14 @@ SOURCES += main.cpp keyboard.cpp
HEADERS += keyboard.h
QMAKE_CXXFLAGS += -std=c++11
QMAKE_LFLAGS += -Wl,--no-undefined
unix:LIBS += -lhidapi-libusb
packagesExist(hidapi-libusb) {
unix:LIBS += -lhidapi-libusb
} else {
packagesExist(hidapi) {
unix:LIBS += -lhidapi
} else {
unix:LIBS += -lhidapi-libusb
}
}

Loading…
Cancel
Save