rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-03-16 08:29:15 +01:00
Code Issues Releases Activity

Merge branch 'OP-1722_libusb_include_incorrect' into next

Browse Source
This commit is contained in:
James Duley 2015-02-15 10:46:30 +13:00
commit d1b8321ccd
2 changed files with 6 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ground/openpilotgcs/src/plugins/ophid/inc/ophid_hidapi.h
View File

@ -33,9 +33,6 @@
#include <QDebug> #include <QDebug>
#include <QString> #include <QString>
#include <QMutex> #include <QMutex>
#if defined(Q_OS_LINUX)
#include <usb.h>
#endif
#include "../hidapi/hidapi.h" #include "../hidapi/hidapi.h"
#include "ophid_const.h" #include "ophid_const.h"
#include "ophid_global.h" #include "ophid_global.h"

30
ground/openpilotgcs/src/plugins/ophid/ophid.pro
View File

@ -38,38 +38,20 @@ macx {
-framework IOKit -framework IOKit
} }
linux-g++ { linux {
SOURCES += src/ophid_usbmon_linux.cpp SOURCES += src/ophid_usbmon_linux.cpp
LIBS += -lusb -ludev LIBS += -ludev -lrt -lpthread
# hidapi library # hidapi library
## rawhid ## rawhid
# SOURCES += hidapi/linux/hid.c # SOURCES += hidapi/linux/hid.c
## libusb ## libusb
SOURCES += hidapi/libusb/hid.c SOURCES += hidapi/libusb/hid.c
LIBS += `pkg-config libusb-1.0 --libs` -lrt -lpthread
INCLUDEPATH += /usr/include/libusb-1.0 CONFIG += link_pkgconfig
# INCLUDEPATH += `pkg-config libusb-1.0 --cflags` PKGCONFIG += libusb-1.0
!exists(/usr/include/libusb-1.0) { !exists(/usr/include/libusb-1.0) {
error(Install libusb-1.0.0-dev using your package manager.) error(Install libusb-1.0-0-dev using your package manager.)
} }
} }
linux-g++-64 {
SOURCES += src/ophid_usbmon_linux.cpp
LIBS += -lusb -ludev
# hidapi library
## rawhid
# SOURCES += hidapi/linux/hid.c
## libusb
SOURCES += hidapi/libusb/hid.c
LIBS += `pkg-config libusb-1.0 --libs` -lrt -lpthread
INCLUDEPATH += /usr/include/libusb-1.0
# INCLUDEPATH += `pkg-config libusb-1.0 --cflags`
!exists(/usr/include/libusb-1.0) {
error(Install libusb-1.0.0-dev using your package manager.)
}
}