@@ -44,12 +44,12 @@ jobs:
4444
4545 - name : Build SFML
4646 run : |
47- cmake -S SFML -B SFML-build -A Win32 -G "Visual Studio 17 2022" -DBUILD_SHARED_LIBS=FALSE -DSFML_USE_STATIC_STD_LIBS=TRUE -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/SFML-install -DCMAKE_VERBOSE_MAKEFILE=ON
47+ cmake -S SFML -B SFML-build -A Win32 -G "Visual Studio 17 2022" -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/SFML-install -DCMAKE_VERBOSE_MAKEFILE=ON
4848 cmake --build SFML-build --config Release --target install
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_ROOT=${{ github.workspace }}/SFML-install -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=ON - DCSFML_LINK_SFML_STATICALLY=OFF -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
@@ -69,23 +69,23 @@ jobs:
6969 Remove-Item -Path "csfml-graphics-3.def"
7070
7171 & gendef.exe "..\..\bin\csfml-window-3.dll"
72- & dlltool.exe -d "csfml-window-3.def" -D "..\..\bin\bin\ csfml-window-3.dll" -l "libcsfml-window.a"
72+ & dlltool.exe -d "csfml-window-3.def" -D "..\..\bin\csfml-window-3.dll" -l "libcsfml-window.a"
7373 Remove-Item -Path "csfml-window-3.def"
7474
7575 & gendef.exe "..\..\bin\csfml-audio-3.dll"
76- & dlltool.exe -d "csfml-audio-3.def" -D "..\..\bin\bin\ csfml-audio-3.dll" -l "libcsfml-audio.a"
76+ & dlltool.exe -d "csfml-audio-3.def" -D "..\..\bin\csfml-audio-3.dll" -l "libcsfml-audio.a"
7777 Remove-Item -Path "csfml-audio-3.def"
7878
7979 & gendef.exe "..\..\bin\csfml-network-3.dll"
80- & dlltool.exe -d "csfml-network-3.def" -D "..\..\bin\bin\ csfml-network-3.dll" -l "libcsfml-network.a"
80+ & dlltool.exe -d "csfml-network-3.def" -D "..\..\bin\csfml-network-3.dll" -l "libcsfml-network.a"
8181 Remove-Item -Path "csfml-network-3.def"
8282
8383 & gendef.exe "..\..\bin\csfml-system-3.dll"
84- & dlltool.exe -d "csfml-system-3.def" -D "..\..\bin\bin\ csfml-system-3.dll" -l "libcsfml-system.a"
84+ & dlltool.exe -d "csfml-system-3.def" -D "..\..\bin\csfml-system-3.dll" -l "libcsfml-system.a"
8585 Remove-Item -Path "csfml-system-3.def"
8686 Pop-Location
8787
88- New-Item -ItemType "directory" -PATH "install"
88+ New-Item -ItemType "directory" -PATH "install\CSFML "
8989 Move-Item -Path "CSFML-install\*" -Destination "install\CSFML"
9090
9191 - name : Upload Artifact
@@ -131,12 +131,12 @@ jobs:
131131
132132 - name : Build SFML
133133 run : |
134- cmake -S SFML -B SFML-build -A x64 -G "Visual Studio 17 2022" -DBUILD_SHARED_LIBS=FALSE -DSFML_USE_STATIC_STD_LIBS=TRUE -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/SFML-install -DCMAKE_VERBOSE_MAKEFILE=ON
134+ cmake -S SFML -B SFML-build -A x64 -G "Visual Studio 17 2022" -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/SFML-install -DCMAKE_VERBOSE_MAKEFILE=ON
135135 cmake --build SFML-build --config Release --target install
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_ROOT=${{ github.workspace }}/SFML-install -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=ON - DCSFML_LINK_SFML_STATICALLY=OFF -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
@@ -156,23 +156,23 @@ jobs:
156156 Remove-Item -Path "csfml-graphics-3.def"
157157
158158 & 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"
159+ & dlltool.exe -d "csfml-window-3.def" -D "..\..\bin\csfml-window-3.dll" -l "libcsfml-window.a"
160160 Remove-Item -Path "csfml-window-3.def"
161161
162162 & 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"
163+ & dlltool.exe -d "csfml-audio-3.def" -D "..\..\bin\csfml-audio-3.dll" -l "libcsfml-audio.a"
164164 Remove-Item -Path "csfml-audio-3.def"
165165
166166 & 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"
167+ & dlltool.exe -d "csfml-network-3.def" -D "..\..\bin\csfml-network-3.dll" -l "libcsfml-network.a"
168168 Remove-Item -Path "csfml-network-3.def"
169169
170170 & 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"
171+ & dlltool.exe -d "csfml-system-3.def" -D "..\..\bin\csfml-system-3.dll" -l "libcsfml-system.a"
172172 Remove-Item -Path "csfml-system-3.def"
173173 Pop-Location
174174
175- New-Item -ItemType "directory" -PATH "install"
175+ New-Item -ItemType "directory" -PATH "install\CSFML "
176176 Move-Item -Path "CSFML-install\*" -Destination "install\CSFML"
177177
178178 - name : Upload Artifact
@@ -205,7 +205,7 @@ jobs:
205205 -DCMAKE_CXX_COMPILER="/usr/bin/clang++" \
206206 -DCMAKE_C_FLAGS="-stdlib=libc++" \
207207 -DCMAKE_CXX_FLAGS="-stdlib=libc++" \
208- -DBUILD_SHARED_LIBS=TRUE \
208+ -DBUILD_SHARED_LIBS=ON \
209209 -DCMAKE_BUILD_TYPE=Release \
210210 -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/SFML-install \
211211 -DCMAKE_OSX_ARCHITECTURES=x86_64 \
@@ -221,8 +221,7 @@ jobs:
221221 -DCMAKE_CXX_COMPILER="/usr/bin/clang++" \
222222 -DCMAKE_C_FLAGS="-stdlib=libc++" \
223223 -DCMAKE_CXX_FLAGS="-stdlib=libc++" \
224- -DBUILD_SHARED_LIBS=TRUE \
225- -DCSFML_LINK_SFML_STATICALLY=FALSE \
224+ -DBUILD_SHARED_LIBS=ON \
226225 -DCMAKE_BUILD_TYPE=Release \
227226 -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/CSFML-install \
228227 -DCMAKE_OSX_ARCHITECTURES=x86_64 \
@@ -268,7 +267,7 @@ jobs:
268267 -DCMAKE_CXX_COMPILER="/usr/bin/clang++" \
269268 -DCMAKE_C_FLAGS="-stdlib=libc++" \
270269 -DCMAKE_CXX_FLAGS="-stdlib=libc++" \
271- -DBUILD_SHARED_LIBS=TRUE \
270+ -DBUILD_SHARED_LIBS=ON \
272271 -DCMAKE_BUILD_TYPE=Release \
273272 -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/SFML-install \
274273 -DCMAKE_OSX_ARCHITECTURES=arm64 \
@@ -284,8 +283,7 @@ jobs:
284283 -DCMAKE_CXX_COMPILER="/usr/bin/clang++" \
285284 -DCMAKE_C_FLAGS="-stdlib=libc++" \
286285 -DCMAKE_CXX_FLAGS="-stdlib=libc++" \
287- -DBUILD_SHARED_LIBS=TRUE \
288- -DCSFML_LINK_SFML_STATICALLY=FALSE \
286+ -DBUILD_SHARED_LIBS=ON \
289287 -DCMAKE_BUILD_TYPE=Release \
290288 -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/CSFML-install \
291289 -DCMAKE_OSX_ARCHITECTURES=arm64 \
0 commit comments