From f2ddf730440e893b7bb1b409c598c0dd1c24e5fe Mon Sep 17 00:00:00 2001
From: "Unknown W. Brackets" <checkins@unknownbrackets.org>
Date: Sat, 2 Jan 2021 18:06:57 -0800
Subject: [PATCH] Build: Include Windows ARM64 in builds too.

---
 .github/workflows/build.yml | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index cd8cb5c730..820cc1d32f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -19,14 +19,15 @@ on:
     - 'appveyor.yml'
 
 env:
-  # Configuration type to build.
-  # You can convert this to a build matrix if you need coverage of multiple configuration types.
-  # https://docs.github.com/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
   BUILD_CONFIGURATION: Release
-  BUILD_PLATFORM: x64
 
 jobs:
   build-windows:
+    strategy:
+      fail-fast: false
+      matrix:
+        platform: [x64, ARM64]
+
     runs-on: windows-latest
     steps:
     - uses: actions/checkout@v2
@@ -38,7 +39,7 @@ jobs:
 
     - name: Build Windows
       working-directory: ${{ env.GITHUB_WORKSPACE }}
-      run: msbuild /m /p:TrackFileAccess=false /p:Configuration=${{ env.BUILD_CONFIGURATION }} /p:Platform=${{ env.BUILD_PLATFORM }} Windows/PPSSPP.sln
+      run: msbuild /m /p:TrackFileAccess=false /p:Configuration=${{ env.BUILD_CONFIGURATION }} /p:Platform=${{ matrix.platform }} Windows/PPSSPP.sln
 
     - name: Package build
       working-directory: ${{ env.GITHUB_WORKSPACE }}
@@ -49,18 +50,18 @@ jobs:
         cp Windows/*.bat ppsspp/
         cp -r assets ppsspp/assets
 
-    - name: Package headless (x86_64)
-      if: env.BUILD_PLATFORM == 'x64'
-      run: cp Windows/x64/Release/*.exe ppsspp/
+    - name: Package headless (non-Win32)
+      if: matrix.platform != 'Win32'
+      run: cp Windows/${{ matrix.platform }}/Release/*.exe ppsspp/
 
-    - name: Package headless (x86_32)
-      if: env.BUILD_PLATFORM != 'x64'
+    - name: Package headless (Win32)
+      if: matrix.platform == 'Win32'
       run: cp Windows/Release/*.exe ppsspp/
 
     - name: Upload build
       uses: actions/upload-artifact@v1
       with:
-        name: Windows x64 build
+        name: Windows ${{ matrix.platform }} build
         path: ppsspp/
 
   build-uwp:
@@ -75,7 +76,7 @@ jobs:
 
     - name: Build UWP
       working-directory: ${{ env.GITHUB_WORKSPACE }}
-      run: msbuild /m /p:TrackFileAccess=false /p:Configuration=${{ env.BUILD_CONFIGURATION }} /p:Platform=${{ env.BUILD_PLATFORM }} /p:AppxPackageSigningEnabled=false UWP/PPSSPP_UWP.sln
+      run: msbuild /m /p:TrackFileAccess=false /p:Configuration=${{ env.BUILD_CONFIGURATION }} /p:Platform=x64 /p:AppxPackageSigningEnabled=false UWP/PPSSPP_UWP.sln
 
   test-windows:
     runs-on: windows-latest