jankae/LibreVNA
1
0
Fork 0
mirror of https://github.com/jankae/LibreVNA.git synced 2026-02-24 00:14:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

macos libusb workflow fix

Browse source
This commit is contained in:
Jan Käberich 2024-11-03 13:43:00 +01:00
parent 67a186be4f
commit 48cc3891cd
4 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Software/PC_Application/LibreVNA-GUI/Calibration/LibreCAL/usbdevice.h
View file

@ -3,7 +3,11 @@
#include "Util/usbinbuffer.h"
#ifdef Q_OS_MACOS
#include <libusb.h>
#else
#include <libusb-1.0/libusb.h>
#endif
#include <QString>
#include <set>
#include <functional>

4
Software/PC_Application/LibreVNA-GUI/Device/LibreVNA/librevnausbdriver.h
View file

@ -4,7 +4,11 @@
#include "librevnadriver.h"
#include "Util/usbinbuffer.h"
#ifdef Q_OS_MACOS
#include <libusb.h>
#else
#include <libusb-1.0/libusb.h>
#endif
#include <thread>
#include <QQueue>

6
Software/PC_Application/LibreVNA-GUI/LibreVNA-GUI.pro
View file

@ -315,6 +315,12 @@ win32:LIBS += -L"$$_PRO_FILE_PWD_" # Github actions placed libusb here
osx:INCPATH += /usr/local/include
osx:LIBS += -L/usr/local/lib $(shell pkg-config --libs libusb-1.0)
mac{
QT_CONFIG -= no-pkg-config
CONFIG += link_pkgconfig
PKGCONFIG += libusb-1.0
}
QT += widgets network
FORMS += \

4
Software/PC_Application/LibreVNA-GUI/Util/usbinbuffer.h
View file

@ -1,7 +1,11 @@
#ifndef USBINBUFFER_H
#define USBINBUFFER_H
#ifdef Q_OS_MACOS
#include <libusb.h>
#else
#include <libusb-1.0/libusb.h>
#endif
#include <condition_variable>
#include <QObject>