Skip to content

Commit

Permalink
Fixed build
Browse files Browse the repository at this point in the history
  • Loading branch information
deathkiller committed Mar 28, 2024
1 parent 4fb031b commit c444a40
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 15 deletions.
17 changes: 5 additions & 12 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,6 @@ jobs:
Platform: x64
ArchExts: AVX2
Backend: SDL2

- BuildType: Release
Platform: ARM64
Backend: GLFW

- BuildType: Release
Platform: ARM64
Backend: SDL2

runs-on: 'windows-latest'

Expand All @@ -67,7 +59,8 @@ jobs:
- name: 'Setup MSBuild'
uses: microsoft/[email protected]

- name: 'Download Build Dependencies'
- if: matrix.Platform != 'ARM64'
name: 'Download Build Dependencies'
run: |
mkdir Libs
cd Libs
Expand All @@ -80,14 +73,14 @@ jobs:
run: |
$archexts = '${{ matrix.ArchExts }}'
switch('${{ matrix.Platform }}') {
'x86' { $arch = 'Win32' }
'x86' { $arch = 'Win32' }
'x64' {
$arch = 'x64'
if(($archexts -eq 'SSE') -or ($archexts -eq 'SSE2')) {
$archexts = ''
}
}
'ARM64' { $arch = 'ARM64EC' }
'ARM64' { $arch = 'ARM64EC' }
}
rm -force ".\Content\Translations\*.po"
Expand All @@ -97,7 +90,7 @@ jobs:
- name: 'Build'
run: |
switch('${{ matrix.Platform }}') {
'x86' { $arch = 'Win32' }
'x86' { $arch = 'Win32' }
'x64' { $arch = 'x64' }
'ARM64' { $arch = 'ARM64EC' }
}
Expand Down
17 changes: 14 additions & 3 deletions .github/workflows/windows_v143.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,14 @@ jobs:
Platform: x64
ArchExts: AVX2
Backend: SDL2

- BuildType: Release
Platform: ARM64
Backend: GLFW

- BuildType: Release
Platform: ARM64
Backend: SDL2

runs-on: 'windows-latest'

Expand All @@ -59,7 +67,8 @@ jobs:
- name: 'Setup MSBuild'
uses: microsoft/[email protected]

- name: 'Download Build Dependencies'
- if: matrix.Platform != 'ARM64'
name: 'Download Build Dependencies'
run: |
mkdir Libs
cd Libs
Expand All @@ -77,7 +86,8 @@ jobs:
if(($archexts -eq 'SSE') -or ($archexts -eq 'SSE2')) {
$archexts = ''
}
}
}
'ARM64' { $arch = 'ARM64EC' }
}
rm -force ".\Content\Translations\*.po"
Expand All @@ -88,7 +98,8 @@ jobs:
run: |
switch('${{ matrix.Platform }}') {
'x86' { $arch = 'Win32' }
'x64' { $arch = 'x64' }
'x64' { $arch = 'x64' }
'ARM64' { $arch = 'ARM64EC' }
}
cd .\_build\
Expand Down

0 comments on commit c444a40

Please sign in to comment.