Skip to content

Commit 0c41b70

Browse files
committed
Update release builds for SFML 3
1 parent c059850 commit 0c41b70

File tree

1 file changed

+32
-32
lines changed

1 file changed

+32
-32
lines changed

.github/workflows/release.yml

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ jobs:
1717
uses: actions/cache@v4
1818
with:
1919
path: ${{ github.workspace }}/mingw32
20-
key: 14.1.0posix-18.1.5-11.0.1-msvcrt-r1-x86
20+
key: 14.2.0posix-19.1.1-12.0.0-ucrt-r2-x86
2121

2222
- name: Install MinGW x86
2323
if: steps.mingw-x86-cache.outputs.cache-hit != 'true'
2424
uses: bwoodsend/setup-winlibs-action@v1
2525
id: winlibs-32
2626
with:
27-
tag: 14.1.0posix-18.1.5-11.0.1-msvcrt-r1
27+
tag: 14.2.0posix-19.1.1-12.0.0-ucrt-r2
2828
with_clang: false
2929
architecture: 32
3030
destination: ${{ github.workspace }}
@@ -34,7 +34,7 @@ jobs:
3434
uses: actions/checkout@v4
3535
with:
3636
repository: SFML/SFML
37-
ref: 2.6.1
37+
ref: 3.0.0
3838
path: SFML
3939

4040
- name: Checkout CSFML
@@ -49,7 +49,7 @@ jobs:
4949
5050
- name: Build CSFML
5151
run: |
52-
cmake -S CSFML -B CSFML-build -A Win32 -G "Visual Studio 17 2022" -DBUILD_SHARED_LIBS=TRUE -DSTATIC_STD_LIBS=TRUE -DCSFML_LINK_SFML_STATICALLY=TRUE -DCMAKE_BUILD_TYPE=Release -DSFML_DIR=${{ github.workspace }}/SFML-install/lib/cmake/SFML -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/CSFML-install -DCMAKE_VERBOSE_MAKEFILE=ON
52+
cmake -S CSFML -B CSFML-build -A Win32 -G "Visual Studio 17 2022" -DBUILD_SHARED_LIBS=TRUE -DSTATIC_STD_LIBS=TRUE -DCSFML_LINK_SFML_STATICALLY=TRUE -DCMAKE_BUILD_TYPE=Release -DSFML_ROOT=${{ github.workspace }}/SFML-install -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/CSFML-install -DCMAKE_VERBOSE_MAKEFILE=ON
5353
cmake --build CSFML-build --config Release --target install
5454
5555
- name: Add MinGW to PATH
@@ -104,14 +104,14 @@ jobs:
104104
uses: actions/cache@v4
105105
with:
106106
path: ${{ github.workspace }}/mingw64
107-
key: 14.1.0posix-18.1.5-11.0.1-msvcrt-r1-x64
107+
key: 14.2.0posix-19.1.1-12.0.0-ucrt-r2-x64
108108

109109
- name: Install MinGW x64
110110
if: steps.mingw-x64-cache.outputs.cache-hit != 'true'
111111
uses: bwoodsend/setup-winlibs-action@v1
112112
id: winlibs-64
113113
with:
114-
tag: 14.1.0posix-18.1.5-11.0.1-msvcrt-r1
114+
tag: 14.2.0posix-19.1.1-12.0.0-ucrt-r2
115115
with_clang: false
116116
architecture: 64
117117
destination: ${{ github.workspace }}
@@ -121,7 +121,7 @@ jobs:
121121
uses: actions/checkout@v4
122122
with:
123123
repository: SFML/SFML
124-
ref: 2.6.1
124+
ref: 3.0.0
125125
path: SFML
126126

127127
- name: Checkout CSFML
@@ -136,7 +136,7 @@ jobs:
136136
137137
- name: Build CSFML
138138
run: |
139-
cmake -S CSFML -B CSFML-build -A x64 -G "Visual Studio 17 2022" -DBUILD_SHARED_LIBS=TRUE -DSTATIC_STD_LIBS=TRUE -DCSFML_LINK_SFML_STATICALLY=TRUE -DCMAKE_BUILD_TYPE=Release -DSFML_DIR=${{ github.workspace }}/SFML-install/lib/cmake/SFML -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/CSFML-install -DCMAKE_VERBOSE_MAKEFILE=ON
139+
cmake -S CSFML -B CSFML-build -A x64 -G "Visual Studio 17 2022" -DBUILD_SHARED_LIBS=TRUE -DSTATIC_STD_LIBS=TRUE -DCSFML_LINK_SFML_STATICALLY=TRUE -DCMAKE_BUILD_TYPE=Release -DSFML_ROOT=${{ github.workspace }}/SFML-install -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/CSFML-install -DCMAKE_VERBOSE_MAKEFILE=ON
140140
cmake --build CSFML-build --config Release --target install
141141
142142
- name: Add MinGW to PATH
@@ -151,25 +151,25 @@ jobs:
151151
Move-Item -Path "CSFML-install\lib\*.lib" -Destination "CSFML-install\lib\msvc"
152152
153153
Push-Location CSFML-install\lib\gcc
154-
& gendef.exe "..\..\bin\csfml-graphics-2.dll"
155-
& dlltool.exe -d "csfml-graphics-2.def" -D "..\..\bin\csfml-graphics-2.dll" -l "libcsfml-graphics.a"
156-
Remove-Item -Path "csfml-graphics-2.def"
154+
& gendef.exe "..\..\bin\csfml-graphics-3.dll"
155+
& dlltool.exe -d "csfml-graphics-3.def" -D "..\..\bin\csfml-graphics-3.dll" -l "libcsfml-graphics.a"
156+
Remove-Item -Path "csfml-graphics-3.def"
157157
158-
& gendef.exe "..\..\bin\csfml-window-2.dll"
159-
& dlltool.exe -d "csfml-window-2.def" -D "..\..\bin\bin\csfml-window-2.dll" -l "libcsfml-window.a"
160-
Remove-Item -Path "csfml-window-2.def"
158+
& gendef.exe "..\..\bin\csfml-window-3.dll"
159+
& dlltool.exe -d "csfml-window-3.def" -D "..\..\bin\bin\csfml-window-3.dll" -l "libcsfml-window.a"
160+
Remove-Item -Path "csfml-window-3.def"
161161
162-
& gendef.exe "..\..\bin\csfml-audio-2.dll"
163-
& dlltool.exe -d "csfml-audio-2.def" -D "..\..\bin\bin\csfml-audio-2.dll" -l "libcsfml-audio.a"
164-
Remove-Item -Path "csfml-audio-2.def"
162+
& gendef.exe "..\..\bin\csfml-audio-3.dll"
163+
& dlltool.exe -d "csfml-audio-3.def" -D "..\..\bin\bin\csfml-audio-3.dll" -l "libcsfml-audio.a"
164+
Remove-Item -Path "csfml-audio-3.def"
165165
166-
& gendef.exe "..\..\bin\csfml-network-2.dll"
167-
& dlltool.exe -d "csfml-network-2.def" -D "..\..\bin\bin\csfml-network-2.dll" -l "libcsfml-network.a"
168-
Remove-Item -Path "csfml-network-2.def"
166+
& gendef.exe "..\..\bin\csfml-network-3.dll"
167+
& dlltool.exe -d "csfml-network-3.def" -D "..\..\bin\bin\csfml-network-3.dll" -l "libcsfml-network.a"
168+
Remove-Item -Path "csfml-network-3.def"
169169
170-
& gendef.exe "..\..\bin\csfml-system-2.dll"
171-
& dlltool.exe -d "csfml-system-2.def" -D "..\..\bin\bin\csfml-system-2.dll" -l "libcsfml-system.a"
172-
Remove-Item -Path "csfml-system-2.def"
170+
& gendef.exe "..\..\bin\csfml-system-3.dll"
171+
& dlltool.exe -d "csfml-system-3.def" -D "..\..\bin\bin\csfml-system-3.dll" -l "libcsfml-system.a"
172+
Remove-Item -Path "csfml-system-3.def"
173173
Pop-Location
174174
175175
New-Item -ItemType "directory" -PATH "install"
@@ -183,14 +183,14 @@ jobs:
183183

184184
macos-x64:
185185
name: macOS x64
186-
runs-on: macos-12
186+
runs-on: macos-13
187187

188188
steps:
189189
- name: Checkout SFML
190190
uses: actions/checkout@v4
191191
with:
192192
repository: SFML/SFML
193-
ref: 2.6.1
193+
ref: 3.0.0
194194
path: SFML
195195

196196
- name: Checkout CSFML
@@ -207,10 +207,10 @@ jobs:
207207
-DCMAKE_CXX_FLAGS="-stdlib=libc++" \
208208
-DBUILD_SHARED_LIBS=TRUE \
209209
-DCMAKE_BUILD_TYPE=Release \
210-
-DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/SFML-install/Library/Frameworks \
210+
-DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/SFML-install \
211211
-DCMAKE_OSX_ARCHITECTURES=x86_64 \
212212
-DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 \
213-
-DSFML_BUILD_FRAMEWORKS=TRUE \
213+
-DSFML_BUILD_FRAMEWORKS=OFF \
214214
-DCMAKE_VERBOSE_MAKEFILE=ON
215215
cmake --build SFML-build --config Release --target install
216216
@@ -227,7 +227,7 @@ jobs:
227227
-DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/CSFML-install \
228228
-DCMAKE_OSX_ARCHITECTURES=x86_64 \
229229
-DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 \
230-
-DSFML_DIR=${{ github.workspace }}/SFML-install/Library/Frameworks/SFML.framework/Resources/CMake \
230+
-DSFML_ROOT=${{ github.workspace }}/SFML-install \
231231
-DCMAKE_VERBOSE_MAKEFILE=ON
232232
cmake --build CSFML-build --config Release --target install
233233
@@ -254,7 +254,7 @@ jobs:
254254
uses: actions/checkout@v4
255255
with:
256256
repository: SFML/SFML
257-
ref: 2.6.1
257+
ref: 3.0.0
258258
path: SFML
259259

260260
- name: Checkout CSFML
@@ -270,10 +270,10 @@ jobs:
270270
-DCMAKE_CXX_FLAGS="-stdlib=libc++" \
271271
-DBUILD_SHARED_LIBS=TRUE \
272272
-DCMAKE_BUILD_TYPE=Release \
273-
-DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/SFML-install/Library/Frameworks \
273+
-DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/SFML-install \
274274
-DCMAKE_OSX_ARCHITECTURES=arm64 \
275275
-DCMAKE_OSX_DEPLOYMENT_TARGET=11.0 \
276-
-DSFML_BUILD_FRAMEWORKS=TRUE \
276+
-DSFML_BUILD_FRAMEWORKS=OFF \
277277
-DCMAKE_VERBOSE_MAKEFILE=ON
278278
cmake --build SFML-build --config Release --target install
279279
@@ -290,7 +290,7 @@ jobs:
290290
-DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/CSFML-install \
291291
-DCMAKE_OSX_ARCHITECTURES=arm64 \
292292
-DCMAKE_OSX_DEPLOYMENT_TARGET=11.0 \
293-
-DSFML_DIR=${{ github.workspace }}/SFML-install/Library/Frameworks/SFML.framework/Resources/CMake \
293+
-DSFML_ROOT=${{ github.workspace }}/SFML-install \
294294
-DCMAKE_VERBOSE_MAKEFILE=ON
295295
cmake --build CSFML-build --config Release --target install
296296

0 commit comments

Comments
 (0)