Skip to content

Commit 3514f3f

Browse files
authored
Update GitHub action for MSBuild on ARM64 native (#626)
1 parent 802ef87 commit 3514f3f

2 files changed

Lines changed: 34 additions & 1 deletion

File tree

.github/workflows/msbuild.yml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ jobs:
4242

4343
- name: Add MSBuild to PATH
4444
uses: microsoft/setup-msbuild@30375c66a4eea26614e0d39710365f22f8b0af57 # v3.0.0
45+
with:
46+
msbuild-architecture: x64
4547

4648
- if: matrix.platform != 'ARM64'
4749
name: Build (Windows 8.1)
@@ -93,9 +95,40 @@ jobs:
9395

9496
- name: Add MSBuild to PATH
9597
uses: microsoft/setup-msbuild@30375c66a4eea26614e0d39710365f22f8b0af57 # v3.0.0
98+
with:
99+
msbuild-architecture: x64
96100

97101
- name: 'Build'
98102
working-directory: ${{ github.workspace }}
99103
run: >
100104
msbuild /m /p:Configuration=${{ matrix.build_type }} /p:Platform=${{ matrix.platform }}
101105
DirectXTK_Desktop_2026.slnx
106+
107+
build2022_arm64:
108+
runs-on: windows-11-arm
109+
110+
strategy:
111+
fail-fast: false
112+
113+
matrix:
114+
build_type: [Debug, Release]
115+
116+
steps:
117+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
118+
119+
- name: Add MSBuild to PATH
120+
uses: microsoft/setup-msbuild@30375c66a4eea26614e0d39710365f22f8b0af57 # v3.0.0
121+
with:
122+
msbuild-architecture: arm64
123+
124+
- name: 'Build (Windows 10)'
125+
working-directory: ${{ github.workspace }}
126+
run: >
127+
msbuild /m /p:Configuration=${{ matrix.build_type }} /p:Platform=ARM64
128+
DirectXTK_Desktop_2022_Win10.sln
129+
130+
- name: 'Build (UWP)'
131+
working-directory: ${{ github.workspace }}
132+
run: >
133+
msbuild /m /p:Configuration=${{ matrix.build_type }} /p:Platform=ARM64
134+
DirectXTK_Windows10_2022.sln

Src/Shaders/CompileShaders.cmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ rem Licensed under the MIT License.
55
setlocal
66
set error=0
77

8-
if %PROCESSOR_ARCHITECTURE%.==ARM64. (set FXCARCH=arm64) else (if %PROCESSOR_ARCHITECTURE%.==AMD64. (set FXCARCH=x64) else (set FXCARCH=x86))
8+
if %PROCESSOR_ARCHITECTURE%.==ARM64. (set FXCARCH=arm64) else (set FXCARCH=x64)
99

1010
set FXCOPTS=/nologo /WX /Ges /Zi /Zpc /Qstrip_reflect /Qstrip_debug
1111

0 commit comments

Comments
 (0)