From f8b3e6d3b19e0da1d9ea7ce377637d11ad06038a Mon Sep 17 00:00:00 2001 From: Philippe Renon Date: Sun, 22 Mar 2015 15:44:29 +0100 Subject: [PATCH] OP-1798 cleaned up ophid.pro --- .../openpilotgcs/src/plugins/ophid/ophid.pro | 52 +++++++++++-------- 1 file changed, 31 insertions(+), 21 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/ophid/ophid.pro b/ground/openpilotgcs/src/plugins/ophid/ophid.pro index f882d9198..8686d1bab 100644 --- a/ground/openpilotgcs/src/plugins/ophid/ophid.pro +++ b/ground/openpilotgcs/src/plugins/ophid/ophid.pro @@ -1,24 +1,29 @@ TEMPLATE = lib TARGET = opHID +DEFINES += OPHID_LIBRARY + include(../../openpilotgcsplugin.pri) include(ophid_dependencies.pri) -HEADERS += inc/ophid_global.h \ - inc/ophid_plugin.h \ - inc/ophid.h \ - inc/ophid_hidapi.h \ - inc/ophid_const.h \ - inc/ophid_usbmon.h \ - inc/ophid_usbsignal.h \ - hidapi/hidapi.h -SOURCES += src/ophid_plugin.cpp \ - src/ophid.cpp \ - src/ophid_usbsignal.cpp \ - src/ophid_hidapi.cpp +HEADERS += \ + inc/ophid_global.h \ + inc/ophid_plugin.h \ + inc/ophid.h \ + inc/ophid_hidapi.h \ + inc/ophid_const.h \ + inc/ophid_usbmon.h \ + inc/ophid_usbsignal.h \ + hidapi/hidapi.h + +SOURCES += \ + src/ophid_plugin.cpp \ + src/ophid.cpp \ + src/ophid_usbsignal.cpp \ + src/ophid_hidapi.cpp + FORMS += RESOURCES += -DEFINES += OPHID_LIBRARY OTHER_FILES += opHID.pluginspec INCLUDEPATH += ./inc @@ -26,25 +31,30 @@ INCLUDEPATH += ./inc # Platform Specific win32 { - SOURCES += src/ophid_usbmon_win.cpp \ - hidapi/windows/hid.c + SOURCES += \ + src/ophid_usbmon_win.cpp \ + hidapi/windows/hid.c + LIBS += -lhid -lsetupapi } macx { - SOURCES += src/ophid_usbmon_mac.cpp \ - hidapi/mac/hid.c - LIBS += -framework CoreFoundation \ - -framework IOKit + SOURCES += \ + src/ophid_usbmon_mac.cpp \ + hidapi/mac/hid.c + + LIBS += -framework CoreFoundation -framework IOKit } linux { - SOURCES += src/ophid_usbmon_linux.cpp + SOURCES += \ + src/ophid_usbmon_linux.cpp + LIBS += -ludev -lrt -lpthread # hidapi library ## rawhid - # SOURCES += hidapi/linux/hid.c + #SOURCES += hidapi/linux/hid.c ## libusb SOURCES += hidapi/libusb/hid.c