Merge branch 'osx' of https://github.com/ttrftech/VNA2 into librevna-rename

This commit is contained in:
Jan Käberich 2021-04-10 12:04:12 +02:00
commit 47b9a7a20d
3 changed files with 40 additions and 1 deletions

35
.github/workflows/BuildOSX.yml vendored Normal file
View File

@ -0,0 +1,35 @@
name: BuildOSX
on:
push:
branches:
- osx
jobs:
PC_Application_OSX:
runs-on: macos-10.15
steps:
- uses: actions/checkout@v1
- name: Install dependencies
run: |
brew install qt libusb
- name: Set Environment
run: |
echo "/usr/local/opt/qt/bin" >> $GITHUB_PATH
- name: Build application
run: |
cd Software/PC_Application
qmake
make -j9
macdeployqt VNA2.app
zip -ry vna2-app.zip VNA2.app
shell: bash
- name: Upload artifact
uses: actions/upload-artifact@v2
with:
name: Application_OSX
path: Software/PC_Application/vna2-app.zip

View File

@ -225,6 +225,8 @@ SOURCES += \
LIBS += -lusb-1.0 LIBS += -lusb-1.0
unix:LIBS += -L/usr/lib/ unix:LIBS += -L/usr/lib/
win32:LIBS += -L"$$_PRO_FILE_PWD_" # Github actions placed libusb here 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 QT += widgets
@ -274,9 +276,10 @@ DISTFILES +=
RESOURCES += \ RESOURCES += \
icons.qrc icons.qrc
CONFIG += c++14 CONFIG += c++17
REVISION = $$system(git rev-parse HEAD) REVISION = $$system(git rev-parse HEAD)
DEFINES += GITHASH=\\"\"$$REVISION\\"\" DEFINES += GITHASH=\\"\"$$REVISION\\"\"
DEFINES += FW_MAJOR=0 FW_MINOR=1 FW_PATCH=0 FW_SUFFIX=\\"\"-alpha.2\\"\" DEFINES += FW_MAJOR=0 FW_MINOR=1 FW_PATCH=0 FW_SUFFIX=\\"\"-alpha.2\\"\"
DEFINES -= _UNICODE UNICODE DEFINES -= _UNICODE UNICODE
TARGET=VNA2

View File

@ -3,6 +3,7 @@
#include "Device/device.h" #include "Device/device.h"
#include <array>
#include <deque> #include <deque>
#include <complex> #include <complex>