@@ -24,14 +24,14 @@ jobs:
2424 uses : actions/cache@v4
2525 with :
2626 path : ${{ github.workspace }}/mingw32
27- key : 14.1 .0posix-18 .1.5-11 .0.1-msvcrt-r1 -x86
27+ key : 14.2 .0posix-19 .1.1-12 .0.0-ucrt-r2 -x86
2828
2929 - name : Install MinGW x86
3030 if : steps.mingw-x86-cache.outputs.cache-hit != 'true'
3131 uses : bwoodsend/setup-winlibs-action@v1
3232 id : winlibs-32
3333 with :
34- tag : 14.1 .0posix-18 .1.5-11 .0.1-msvcrt-r1
34+ tag : 14.2 .0posix-19 .1.1-12 .0.0-ucrt-r2
3535 with_clang : false
3636 architecture : 32
3737 destination : ${{ github.workspace }}
4141 uses : actions/checkout@v4
4242 with :
4343 repository : SFML/SFML
44- ref : 2.6.1
44+ ref : 3.0.0
4545 path : SFML
4646
4747 - name : Checkout CSFML
5656
5757 - name : Build CSFML
5858 run : |
59- 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
59+ 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
6060 cmake --build CSFML-build --config Release --target install
6161
6262 - name : Add MinGW to PATH
@@ -71,25 +71,25 @@ jobs:
7171 Move-Item -Path "CSFML-install\lib\*.lib" -Destination "CSFML-install\lib\msvc"
7272
7373 Push-Location CSFML-install\lib\gcc
74- & gendef.exe "..\..\bin\csfml-graphics-2 .dll"
75- & dlltool.exe -d "csfml-graphics-2 .def" -D "..\..\bin\csfml-graphics-2 .dll" -l "libcsfml-graphics.a"
76- Remove-Item -Path "csfml-graphics-2 .def"
74+ & gendef.exe "..\..\bin\csfml-graphics-3 .dll"
75+ & dlltool.exe -d "csfml-graphics-3 .def" -D "..\..\bin\csfml-graphics-3 .dll" -l "libcsfml-graphics.a"
76+ Remove-Item -Path "csfml-graphics-3 .def"
7777
78- & gendef.exe "..\..\bin\csfml-window-2 .dll"
79- & dlltool.exe -d "csfml-window-2 .def" -D "..\..\bin\bin\csfml-window-2 .dll" -l "libcsfml-window.a"
80- Remove-Item -Path "csfml-window-2 .def"
78+ & gendef.exe "..\..\bin\csfml-window-3 .dll"
79+ & dlltool.exe -d "csfml-window-3 .def" -D "..\..\bin\bin\csfml-window-3 .dll" -l "libcsfml-window.a"
80+ Remove-Item -Path "csfml-window-3 .def"
8181
82- & gendef.exe "..\..\bin\csfml-audio-2 .dll"
83- & dlltool.exe -d "csfml-audio-2 .def" -D "..\..\bin\bin\csfml-audio-2 .dll" -l "libcsfml-audio.a"
84- Remove-Item -Path "csfml-audio-2 .def"
82+ & gendef.exe "..\..\bin\csfml-audio-3 .dll"
83+ & dlltool.exe -d "csfml-audio-3 .def" -D "..\..\bin\bin\csfml-audio-3 .dll" -l "libcsfml-audio.a"
84+ Remove-Item -Path "csfml-audio-3 .def"
8585
86- & gendef.exe "..\..\bin\csfml-network-2 .dll"
87- & dlltool.exe -d "csfml-network-2 .def" -D "..\..\bin\bin\csfml-network-2 .dll" -l "libcsfml-network.a"
88- Remove-Item -Path "csfml-network-2 .def"
86+ & gendef.exe "..\..\bin\csfml-network-3 .dll"
87+ & dlltool.exe -d "csfml-network-3 .def" -D "..\..\bin\bin\csfml-network-3 .dll" -l "libcsfml-network.a"
88+ Remove-Item -Path "csfml-network-3 .def"
8989
90- & gendef.exe "..\..\bin\csfml-system-2 .dll"
91- & dlltool.exe -d "csfml-system-2 .def" -D "..\..\bin\bin\csfml-system-2 .dll" -l "libcsfml-system.a"
92- Remove-Item -Path "csfml-system-2 .def"
90+ & gendef.exe "..\..\bin\csfml-system-3 .dll"
91+ & dlltool.exe -d "csfml-system-3 .def" -D "..\..\bin\bin\csfml-system-3 .dll" -l "libcsfml-system.a"
92+ Remove-Item -Path "csfml-system-3 .def"
9393 Pop-Location
9494
9595 New-Item -ItemType "directory" -PATH "install"
@@ -111,14 +111,14 @@ jobs:
111111 uses : actions/cache@v4
112112 with :
113113 path : ${{ github.workspace }}/mingw64
114- key : 14.1 .0posix-18 .1.5-11 .0.1-msvcrt-r1 -x64
114+ key : 14.2 .0posix-19 .1.1-12 .0.0-ucrt-r2 -x64
115115
116116 - name : Install MinGW x64
117117 if : steps.mingw-x64-cache.outputs.cache-hit != 'true'
118118 uses : bwoodsend/setup-winlibs-action@v1
119119 id : winlibs-64
120120 with :
121- tag : 14.1 .0posix-18 .1.5-11 .0.1-msvcrt-r1
121+ tag : 14.2 .0posix-19 .1.1-12 .0.0-ucrt-r2
122122 with_clang : false
123123 architecture : 64
124124 destination : ${{ github.workspace }}
@@ -128,7 +128,7 @@ jobs:
128128 uses : actions/checkout@v4
129129 with :
130130 repository : SFML/SFML
131- ref : 2.6.1
131+ ref : 3.0.0
132132 path : SFML
133133
134134 - name : Checkout CSFML
@@ -143,7 +143,7 @@ jobs:
143143
144144 - name : Build CSFML
145145 run : |
146- 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
146+ 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
147147 cmake --build CSFML-build --config Release --target install
148148
149149 - name : Add MinGW to PATH
@@ -158,25 +158,25 @@ jobs:
158158 Move-Item -Path "CSFML-install\lib\*.lib" -Destination "CSFML-install\lib\msvc"
159159
160160 Push-Location CSFML-install\lib\gcc
161- & gendef.exe "..\..\bin\csfml-graphics-2 .dll"
162- & dlltool.exe -d "csfml-graphics-2 .def" -D "..\..\bin\csfml-graphics-2 .dll" -l "libcsfml-graphics.a"
163- Remove-Item -Path "csfml-graphics-2 .def"
161+ & gendef.exe "..\..\bin\csfml-graphics-3 .dll"
162+ & dlltool.exe -d "csfml-graphics-3 .def" -D "..\..\bin\csfml-graphics-3 .dll" -l "libcsfml-graphics.a"
163+ Remove-Item -Path "csfml-graphics-3 .def"
164164
165- & gendef.exe "..\..\bin\csfml-window-2 .dll"
166- & dlltool.exe -d "csfml-window-2 .def" -D "..\..\bin\bin\csfml-window-2 .dll" -l "libcsfml-window.a"
167- Remove-Item -Path "csfml-window-2 .def"
165+ & gendef.exe "..\..\bin\csfml-window-3 .dll"
166+ & dlltool.exe -d "csfml-window-3 .def" -D "..\..\bin\bin\csfml-window-3 .dll" -l "libcsfml-window.a"
167+ Remove-Item -Path "csfml-window-3 .def"
168168
169- & gendef.exe "..\..\bin\csfml-audio-2 .dll"
170- & dlltool.exe -d "csfml-audio-2 .def" -D "..\..\bin\bin\csfml-audio-2 .dll" -l "libcsfml-audio.a"
171- Remove-Item -Path "csfml-audio-2 .def"
169+ & gendef.exe "..\..\bin\csfml-audio-3 .dll"
170+ & dlltool.exe -d "csfml-audio-3 .def" -D "..\..\bin\bin\csfml-audio-3 .dll" -l "libcsfml-audio.a"
171+ Remove-Item -Path "csfml-audio-3 .def"
172172
173- & gendef.exe "..\..\bin\csfml-network-2 .dll"
174- & dlltool.exe -d "csfml-network-2 .def" -D "..\..\bin\bin\csfml-network-2 .dll" -l "libcsfml-network.a"
175- Remove-Item -Path "csfml-network-2 .def"
173+ & gendef.exe "..\..\bin\csfml-network-3 .dll"
174+ & dlltool.exe -d "csfml-network-3 .def" -D "..\..\bin\bin\csfml-network-3 .dll" -l "libcsfml-network.a"
175+ Remove-Item -Path "csfml-network-3 .def"
176176
177- & gendef.exe "..\..\bin\csfml-system-2 .dll"
178- & dlltool.exe -d "csfml-system-2 .def" -D "..\..\bin\bin\csfml-system-2 .dll" -l "libcsfml-system.a"
179- Remove-Item -Path "csfml-system-2 .def"
177+ & gendef.exe "..\..\bin\csfml-system-3 .dll"
178+ & dlltool.exe -d "csfml-system-3 .def" -D "..\..\bin\bin\csfml-system-3 .dll" -l "libcsfml-system.a"
179+ Remove-Item -Path "csfml-system-3 .def"
180180 Pop-Location
181181
182182 New-Item -ItemType "directory" -PATH "install"
@@ -190,14 +190,14 @@ jobs:
190190
191191 macos-x64 :
192192 name : macOS x64
193- runs-on : macos-12
193+ runs-on : macos-13
194194
195195 steps :
196196 - name : Checkout SFML
197197 uses : actions/checkout@v4
198198 with :
199199 repository : SFML/SFML
200- ref : 2.6.1
200+ ref : 3.0.0
201201 path : SFML
202202
203203 - name : Checkout CSFML
@@ -214,10 +214,10 @@ jobs:
214214 -DCMAKE_CXX_FLAGS="-stdlib=libc++" \
215215 -DBUILD_SHARED_LIBS=TRUE \
216216 -DCMAKE_BUILD_TYPE=Release \
217- -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/SFML-install/Library/Frameworks \
217+ -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/SFML-install \
218218 -DCMAKE_OSX_ARCHITECTURES=x86_64 \
219219 -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 \
220- -DSFML_BUILD_FRAMEWORKS=TRUE \
220+ -DSFML_BUILD_FRAMEWORKS=OFF \
221221 -DCMAKE_VERBOSE_MAKEFILE=ON
222222 cmake --build SFML-build --config Release --target install
223223
@@ -234,7 +234,7 @@ jobs:
234234 -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/CSFML-install \
235235 -DCMAKE_OSX_ARCHITECTURES=x86_64 \
236236 -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 \
237- -DSFML_DIR =${{ github.workspace }}/SFML-install/Library/Frameworks/SFML.framework/Resources/CMake \
237+ -DSFML_ROOT =${{ github.workspace }}/SFML-install \
238238 -DCMAKE_VERBOSE_MAKEFILE=ON
239239 cmake --build CSFML-build --config Release --target install
240240
@@ -261,7 +261,7 @@ jobs:
261261 uses : actions/checkout@v4
262262 with :
263263 repository : SFML/SFML
264- ref : 2.6.1
264+ ref : 3.0.0
265265 path : SFML
266266
267267 - name : Checkout CSFML
@@ -277,10 +277,10 @@ jobs:
277277 -DCMAKE_CXX_FLAGS="-stdlib=libc++" \
278278 -DBUILD_SHARED_LIBS=TRUE \
279279 -DCMAKE_BUILD_TYPE=Release \
280- -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/SFML-install/Library/Frameworks \
280+ -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/SFML-install \
281281 -DCMAKE_OSX_ARCHITECTURES=arm64 \
282282 -DCMAKE_OSX_DEPLOYMENT_TARGET=11.0 \
283- -DSFML_BUILD_FRAMEWORKS=TRUE \
283+ -DSFML_BUILD_FRAMEWORKS=OFF \
284284 -DCMAKE_VERBOSE_MAKEFILE=ON
285285 cmake --build SFML-build --config Release --target install
286286
@@ -297,7 +297,7 @@ jobs:
297297 -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/CSFML-install \
298298 -DCMAKE_OSX_ARCHITECTURES=arm64 \
299299 -DCMAKE_OSX_DEPLOYMENT_TARGET=11.0 \
300- -DSFML_DIR =${{ github.workspace }}/SFML-install/Library/Frameworks/SFML.framework/Resources/CMake \
300+ -DSFML_ROOT =${{ github.workspace }}/SFML-install \
301301 -DCMAKE_VERBOSE_MAKEFILE=ON
302302 cmake --build CSFML-build --config Release --target install
303303
0 commit comments