3 files changed, 65 insertions, 50 deletions
diff --git a/.github/azure-workflows/build-mac-arm64.yml b/.github/azure-workflows/build-mac-arm64.yml
deleted file mode 100644
index 721c6ac..0000000
--- a/.github/azure-workflows/build-mac-arm64.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-trigger:
-- master
-
-pool:
-  name: Default
-  demands:
-   - agent.name -equals MacStadium-ARM64-Mac
-
-workspace:
-  clean: all
-    
-steps:
-- script: mkdir $(Pipeline.Workspace)/build
-  displayName: 'Create build environment'
-
-- script: arch -arm64 cmake $(Build.SourcesDirectory) -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_PREFIX_PATH="$(brew --prefix qt@6);$(brew --prefix libarchive)" -DMACOS_BUNDLE_LIBS=ON -DMACOS_BUILD_DMG=ON -DUSE_QT6=ON
-  displayName: 'Configure'
-  workingDirectory: $(Pipeline.Workspace)/build
-  
-- script: arch -arm64 make -j$(sysctl -n hw.logicalcpu)
-  displayName: 'Make'
-  workingDirectory: $(Pipeline.Workspace)/build
-
-- publish: $(Pipeline.Workspace)/build/melonDS.dmg
-  artifact: melonDS.dmg
-
diff --git a/.github/azure-workflows/build-mac-x86_64.yml b/.github/azure-workflows/build-mac-x86_64.yml
deleted file mode 100644
index 3151c25..0000000
--- a/.github/azure-workflows/build-mac-x86_64.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-trigger:
-- master
-
-pool:
-  vmImage: macOS-10.15
-
-steps:
-- script: brew install llvm sdl2 qt@6 libslirp libarchive libepoxy
-  displayName: 'Install dependencies'
-
-- script: mkdir $(Pipeline.Workspace)/build
-  displayName: 'Create build environment'
-
-- script: cmake $(Build.SourcesDirectory) -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_PREFIX_PATH="$(brew --prefix qt@6);$(brew --prefix libarchive)" -DMACOS_BUNDLE_LIBS=ON -DMACOS_BUILD_DMG=ON -DUSE_QT6=ON
-  displayName: 'Configure'
-  workingDirectory: $(Pipeline.Workspace)/build
-  
-- script: make -j$(sysctl -n hw.logicalcpu)
-  displayName: 'Make'
-  workingDirectory: $(Pipeline.Workspace)/build
-
-- publish: $(Pipeline.Workspace)/build/melonDS.dmg
-  artifact: melonDS.dmg
-
diff --git a/.github/workflows/build-macos-universal.yml b/.github/workflows/build-macos-universal.yml
new file mode 100644
index 0000000..b4ad1a6
--- /dev/null
+++ b/.github/workflows/build-macos-universal.yml
@@ -0,0 +1,65 @@
+name: CMake Build (macOS Universal)
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  prepare:
+    runs-on: [self-hosted, macOS, ARM64]
+    
+    steps:
+      - uses: AutoModality/action-clean@v1
+
+      - uses: actions/checkout@v3      
+
+
+  build-arm64:
+    runs-on: [self-hosted, macOS, ARM64]
+
+    steps:
+      - name: Create build directory
+        run: mkdir ${{runner.workspace}}/build/arm64
+
+      - name: Configure
+        working-directory: ${{runner.workspace}}/build/arm64
+        run: arch -arm64 /opt/homebrew/bin/cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_PREFIX_PATH="$(brew --prefix qt@6);$(brew --prefix libarchive)" -DMACOS_BUNDLE_LIBS=ON -DUSE_QT6=ON
+
+      - name: Make
+        working-directory: ${{runner.workspace}}/build/arm64
+        run: arch -arm64 make -j$(sysctl -n hw.logicalcpu)
+
+  build-x86_64:
+    runs-on: [self-hosted, macOS, ARM64]
+
+    steps:
+      - name: Create build directory
+        run: mkdir ${{runner.workspace}}/build/x86_64
+
+      - name: Configure
+        working-directory: ${{runner.workspace}}/build/x86_64
+        run: arch -x86_64 /usr/local/bin/cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_PREFIX_PATH="$(brew --prefix qt@6);$(brew --prefix libarchive)" -DMACOS_BUNDLE_LIBS=ON -DUSE_QT6=ON
+
+      - name: Make
+        working-directory: ${{runner.workspace}}/build/x86_64
+        run: arch -x86_64 make -j$(sysctl -n hw.logicalcpu)
+
+  universal-binary:
+    runs-on: [self-hosted, macOS, ARM64]
+
+    steps:
+      - name: Merge binaries
+        run: $GITHUB_WORKSPACE/tools/mac-universal.py ${{runner.workspace}}/build/arm64/melonDS.app ${{runner.workspace}}/build/x86_64/melonDS.app ${{runner.workspace}}/build/universal/melonDS.app
+
+      - name: Create DMG
+        run: hdiutil create -fs HFS+ -volname melonDS -srcfolder ${{runner.workspace}}/build/universal/melonDS.app -ov -format UDBZ ${{runner.workspace}}/build/universal/melonDS.dmg
+
+      - uses: actions/upload-artifact@v3
+        with:
+          name: macOS-universal
+          path: ${{runner.workspace}}/build/universal/melonDS.dmg
+