diff --git a/Software/PC_Application/Application.pro b/Software/PC_Application/Application.pro index ebc52e2..30068d8 100644 --- a/Software/PC_Application/Application.pro +++ b/Software/PC_Application/Application.pro @@ -221,6 +221,8 @@ SOURCES += \ LIBS += -lusb-1.0 unix:LIBS += -L/usr/lib/ win32:LIBS += -L"$$_PRO_FILE_PWD_" # Github actions placed libusb here +osx:INCPATH += /usr/local/include +osx:LIBS += $(shell pkg-config --libs libusb-1.0) QT += widgets @@ -268,7 +270,7 @@ DISTFILES += RESOURCES += \ icons.qrc -CONFIG += c++14 +CONFIG += c++17 REVISION = $$system(git rev-parse HEAD) DEFINES += GITHASH=\\"\"$$REVISION\\"\" DEFINES += FW_MAJOR=0 FW_MINOR=1 FW_PATCH=0 FW_SUFFIX=\\"\"-alpha.2\\"\" diff --git a/Software/PC_Application/averaging.h b/Software/PC_Application/averaging.h index af9499a..7745b3b 100644 --- a/Software/PC_Application/averaging.h +++ b/Software/PC_Application/averaging.h @@ -3,6 +3,7 @@ #include "Device/device.h" +#include #include #include