Skip to content

Commit 1e9c673

Browse files
committed
wip msys2
1 parent 577b0e1 commit 1e9c673

File tree

1 file changed

+10
-13
lines changed

1 file changed

+10
-13
lines changed

.github/workflows/build.yml

+10-13
Original file line numberDiff line numberDiff line change
@@ -89,25 +89,22 @@ jobs:
8989
- name: "Checkout sources"
9090
uses: actions/checkout@v3
9191

92-
- name: "Install dependencies"
93-
run: |
94-
.\.github\get-deps-mingw.ps1
92+
- name: "Install MSYS2 and packages"
93+
uses: msys2/setup-msys2@v2
94+
with:
95+
msystem: MINGW64
96+
install: "make diffutils mingw-w64-x86_64-gcc mingw-w64-x86_64-SDL2 mingw-w64-x86_64-SDL2_image"
9597

9698
- name: "Compile"
97-
shell: powershell
99+
shell: "msys2 {0}"
98100
run: |
99-
$env:path = $env:path + ";" + (Join-Path $pwd.Drive.Root "opt/local/x86_64-w64-mingw32/bin")
100-
$env:path = $env:path + ';C:\Program Files (x86)\Windows Kits\10\bin\10.0.22000.0\x64'
101-
mingw32-make SYSTEM=WINDOWS CC=gcc bin/brogue.exe
101+
make SYSTEM=WINDOWS CC=gcc bin/brogue.exe
102+
ldd bin/brogue.exe
102103
103104
- name: "Create artifact"
105+
shell: "msys2 {0}"
104106
run: |
105-
mingw32-make SYSTEM=WINDOWS BrogueCE-windows
106-
cp SDL2\x86_64-w64-mingw32\bin\SDL2.dll BrogueCE-windows
107-
cp SDL2_image\x86_64-w64-mingw32\bin\zlib1.dll BrogueCE-windows
108-
cp SDL2_image\x86_64-w64-mingw32\bin\SDL2_image.dll BrogueCE-windows
109-
cp SDL2_image\x86_64-w64-mingw32\bin\libpng16-16.dll BrogueCE-windows
110-
7z a BrogueCE-windows-x86_64.zip BrogueCE-windows
107+
make SYSTEM=WINDOWS BrogueCE-windows
111108
112109
- name: "Upload artifact"
113110
uses: actions/upload-artifact@v4

0 commit comments

Comments
 (0)