From 55b8edec0c6355227403f8fc0940dae92539d820 Mon Sep 17 00:00:00 2001
From: TT <edy555@gmail.com>
Date: Sat, 6 Feb 2021 00:41:16 +0900
Subject: [PATCH 1/5] osx patch

---
 Software/PC_Application/Application.pro | 4 +++-
 Software/PC_Application/averaging.h     | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

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 <array>
 #include <deque>
 #include <complex>
 

From 8a4055dc910a07903093f4254a4b7f6af916e193 Mon Sep 17 00:00:00 2001
From: TT <edy555@gmail.com>
Date: Sat, 6 Feb 2021 10:19:25 +0900
Subject: [PATCH 2/5] change Application name to VNA2

---
 Software/PC_Application/Application.pro | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Software/PC_Application/Application.pro b/Software/PC_Application/Application.pro
index 30068d8..62e8386 100644
--- a/Software/PC_Application/Application.pro
+++ b/Software/PC_Application/Application.pro
@@ -276,3 +276,4 @@ DEFINES += GITHASH=\\"\"$$REVISION\\"\"
 DEFINES += FW_MAJOR=0 FW_MINOR=1 FW_PATCH=0 FW_SUFFIX=\\"\"-alpha.2\\"\"
 DEFINES -= _UNICODE UNICODE
 
+TARGET=VNA2

From da24503b8e36c8c11d499a404686ad5a035866a9 Mon Sep 17 00:00:00 2001
From: TT <edy555@gmail.com>
Date: Sat, 6 Feb 2021 10:50:16 +0900
Subject: [PATCH 3/5] add build workflow for osx

---
 .github/workflows/BuildOSX.yml | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 .github/workflows/BuildOSX.yml

diff --git a/.github/workflows/BuildOSX.yml b/.github/workflows/BuildOSX.yml
new file mode 100644
index 0000000..2b2568e
--- /dev/null
+++ b/.github/workflows/BuildOSX.yml
@@ -0,0 +1,29 @@
+name: BuildOSX
+
+on:
+  push:
+    branches:
+      - osx
+
+jobs:
+  PC_Application_OSX:
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v1
+
+      - name: Install dependencies
+        run: |
+          brew install qt libusb
+          
+      - name: Build application
+        run: |
+          cd Software/PC_Application
+          qmake
+          make -j9
+        shell: bash
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: Application_OSX
+          path: Software/PC_Application/VNA.app

From eb5a8d1fdd0ec6cd55541259b305804febae4233 Mon Sep 17 00:00:00 2001
From: TT <edy555@gmail.com>
Date: Sat, 6 Feb 2021 10:54:02 +0900
Subject: [PATCH 4/5] add qt path

---
 .github/workflows/BuildOSX.yml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/BuildOSX.yml b/.github/workflows/BuildOSX.yml
index 2b2568e..1ebcd0e 100644
--- a/.github/workflows/BuildOSX.yml
+++ b/.github/workflows/BuildOSX.yml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   PC_Application_OSX:
-    runs-on: macos-latest
+    runs-on: macos-10.15
     steps:
       - uses: actions/checkout@v1
 
@@ -15,15 +15,20 @@ jobs:
         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
+          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/VNA.app
+          path: Software/PC_Application/vna2-app.zip

From 33b878e52e829c3184c97394a7d5ff5cb9784165 Mon Sep 17 00:00:00 2001
From: TT <edy555@gmail.com>
Date: Sat, 6 Feb 2021 11:59:57 +0900
Subject: [PATCH 5/5] add macdeployqt in build step

---
 .github/workflows/BuildOSX.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/BuildOSX.yml b/.github/workflows/BuildOSX.yml
index 1ebcd0e..27a9eb4 100644
--- a/.github/workflows/BuildOSX.yml
+++ b/.github/workflows/BuildOSX.yml
@@ -24,6 +24,7 @@ jobs:
           cd Software/PC_Application
           qmake
           make -j9
+          macdeployqt VNA2.app
           zip -ry vna2-app.zip VNA2.app
         shell: bash