From 46b1bf840b7e37c8d12992f135a4f554c1eb5074 Mon Sep 17 00:00:00 2001
From: Darryl Pogue <darryl@dpogue.ca>
Date: Sun, 31 Jan 2021 11:41:19 -0800
Subject: [PATCH 1/4] Fix macOS GLPipeline stub compiling

---
 Sources/Plasma/PubUtilLib/plPipeline/GL/plGLDeviceRef.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Sources/Plasma/PubUtilLib/plPipeline/GL/plGLDeviceRef.h b/Sources/Plasma/PubUtilLib/plPipeline/GL/plGLDeviceRef.h
index a7dfa73f47..4edc9091f7 100644
--- a/Sources/Plasma/PubUtilLib/plPipeline/GL/plGLDeviceRef.h
+++ b/Sources/Plasma/PubUtilLib/plPipeline/GL/plGLDeviceRef.h
@@ -45,7 +45,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "HeadSpin.h"
 #include "hsGDeviceRef.h"
 
-#include <GL/gl.h>
+#if HS_BUILD_FOR_MACOS
+#    include <OpenGL/gl3.h>
+#else
+#    include <GL/gl.h>
+#endif
 
 class plGLDeviceRef : public hsGDeviceRef
 {

From debc5cddd5102cbd1c4236e1c89d08b368033055 Mon Sep 17 00:00:00 2001
From: Darryl Pogue <darryl@dpogue.ca>
Date: Sat, 30 Jan 2021 15:26:34 -0800
Subject: [PATCH 2/4] Add macOS x64 CI to workflow

---
 .github/workflows/ci.yml | 61 +++++++++++++++++++++++++++++++++++++---
 1 file changed, 57 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 26656ee249..f8ff2e7b91 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -31,8 +31,6 @@ jobs:
 
       - name: Configure
         run: |
-          New-Item -ItemType Directory build | Out-Null
-          Set-Location build
           cmake `
             -G "${{ matrix.platform.generator }}" -A "${{ matrix.platform.arch }}" `
             -DPLASMA_BUILD_TESTS=ON `
@@ -42,7 +40,7 @@ jobs:
             -DPLASMA_VCPKG_NUGET_OWNER="${{ github.repository_owner }}" `
             -DPLASMA_VCPKG_NUGET_TOKEN="${{ secrets.GITHUB_TOKEN }}" `
             -DPLASMA_VCPKG_NUGET_RW=TRUE `
-            ..
+            -S . -B build
 
       - name: Build
         run: |
@@ -98,7 +96,62 @@ jobs:
       - name: Configure
         run: |
           cmake \
-            -GNinja \
+            -G Ninja \
+            -DUSE_VCPKG=ON \
+            -DCMAKE_BUILD_TYPE=${{ matrix.cfg.type }} \
+            -DPLASMA_BUILD_TESTS=ON \
+            -DPLASMA_BUILD_TOOLS=ON \
+            -DPLASMA_EXTERNAL_RELEASE=${{ matrix.cfg.external }} \
+            -DPLASMA_VCPKG_NUGET_SOURCE="https://nuget.pkg.github.com/${{ github.repository_owner }}/index.json" \
+            -DPLASMA_VCPKG_NUGET_OWNER="${{ github.repository_owner }}" \
+            -DPLASMA_VCPKG_NUGET_TOKEN="${{ secrets.GITHUB_TOKEN }}" \
+            -DPLASMA_VCPKG_NUGET_RW=TRUE \
+            -S . -B build
+
+      - name: Build
+        run: |
+          cmake --build build -j 2
+
+      - name: Test
+        run: |
+          cmake --build build --target check -j 2
+
+      - name: Install
+        run: |
+          cmake --build build --target install -j 2
+
+
+  macos:
+    runs-on: macos-latest
+    name: ${{ matrix.platform.str }}-${{ matrix.cfg.str }}
+    strategy:
+      matrix:
+        platform:
+          - { str: macos-x64 }
+        cfg:
+          - { external: OFF, type: RelWithDebInfo, str: internal-release }
+          - { external: OFF, type: Debug, str: internal-debug }
+          - { external: ON, type: RelWithDebInfo, str: external-release }
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          submodules: true
+
+      - name: Install dependencies
+        run: |
+          brew update
+          brew install \
+              autoconf \
+              cairo \
+              libtool \
+              nasm \
+              qt5
+
+      - name: Configure
+        run: |
+          cmake \
             -DUSE_VCPKG=ON \
             -DCMAKE_BUILD_TYPE=${{ matrix.cfg.type }} \
             -DPLASMA_BUILD_TESTS=ON \

From bb0ee1c032879ca09b36b87520a84abb1a9a9115 Mon Sep 17 00:00:00 2001
From: Darryl Pogue <darryl@dpogue.ca>
Date: Thu, 4 Feb 2021 08:26:34 -0800
Subject: [PATCH 3/4] Let macOS find homebrew's Qt5

---
 .github/workflows/ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f8ff2e7b91..f1da68122a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -162,6 +162,8 @@ jobs:
             -DPLASMA_VCPKG_NUGET_TOKEN="${{ secrets.GITHUB_TOKEN }}" \
             -DPLASMA_VCPKG_NUGET_RW=TRUE \
             -S . -B build
+        env:
+          PKG_CONFIG_PATH: "/usr/local/opt/qt/lib/pkgconfig"
 
       - name: Build
         run: |

From 0cfe512782d88c2c87fba05fb833a622a8bae397 Mon Sep 17 00:00:00 2001
From: Darryl Pogue <darryl@dpogue.ca>
Date: Thu, 4 Feb 2021 08:59:12 -0800
Subject: [PATCH 4/4] Try CMAKE_PREFIX_PATH instead

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f1da68122a..05f5e6d864 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -163,7 +163,7 @@ jobs:
             -DPLASMA_VCPKG_NUGET_RW=TRUE \
             -S . -B build
         env:
-          PKG_CONFIG_PATH: "/usr/local/opt/qt/lib/pkgconfig"
+          CMAKE_PREFIX_PATH: "/usr/local/opt/qt"
 
       - name: Build
         run: |