@@ -51,12 +51,12 @@ jobs:
5151
5252 - name : Build SFML
5353 run : |
54- 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
54+ 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
5555 cmake --build SFML-build --config Release --target install
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_ROOT=${{ github.workspace }}/SFML-install -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=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
6060 cmake --build CSFML-build --config Release --target install
6161
6262 - name : Add MinGW to PATH
@@ -76,23 +76,23 @@ jobs:
7676 Remove-Item -Path "csfml-graphics-3.def"
7777
7878 & 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"
79+ & dlltool.exe -d "csfml-window-3.def" -D "..\..\bin\csfml-window-3.dll" -l "libcsfml-window.a"
8080 Remove-Item -Path "csfml-window-3.def"
8181
8282 & 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"
83+ & dlltool.exe -d "csfml-audio-3.def" -D "..\..\bin\csfml-audio-3.dll" -l "libcsfml-audio.a"
8484 Remove-Item -Path "csfml-audio-3.def"
8585
8686 & 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"
87+ & dlltool.exe -d "csfml-network-3.def" -D "..\..\bin\csfml-network-3.dll" -l "libcsfml-network.a"
8888 Remove-Item -Path "csfml-network-3.def"
8989
9090 & 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"
91+ & dlltool.exe -d "csfml-system-3.def" -D "..\..\bin\csfml-system-3.dll" -l "libcsfml-system.a"
9292 Remove-Item -Path "csfml-system-3.def"
9393 Pop-Location
9494
95- New-Item -ItemType "directory" -PATH "install"
95+ New-Item -ItemType "directory" -PATH "install\CSFML "
9696 Move-Item -Path "CSFML-install\*" -Destination "install\CSFML"
9797
9898 - name : Upload Artifact
@@ -138,12 +138,12 @@ jobs:
138138
139139 - name : Build SFML
140140 run : |
141- 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
141+ 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
142142 cmake --build SFML-build --config Release --target install
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_ROOT=${{ github.workspace }}/SFML-install -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=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
147147 cmake --build CSFML-build --config Release --target install
148148
149149 - name : Add MinGW to PATH
@@ -163,23 +163,23 @@ jobs:
163163 Remove-Item -Path "csfml-graphics-3.def"
164164
165165 & 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"
166+ & dlltool.exe -d "csfml-window-3.def" -D "..\..\bin\csfml-window-3.dll" -l "libcsfml-window.a"
167167 Remove-Item -Path "csfml-window-3.def"
168168
169169 & 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"
170+ & dlltool.exe -d "csfml-audio-3.def" -D "..\..\bin\csfml-audio-3.dll" -l "libcsfml-audio.a"
171171 Remove-Item -Path "csfml-audio-3.def"
172172
173173 & 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"
174+ & dlltool.exe -d "csfml-network-3.def" -D "..\..\bin\csfml-network-3.dll" -l "libcsfml-network.a"
175175 Remove-Item -Path "csfml-network-3.def"
176176
177177 & 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"
178+ & dlltool.exe -d "csfml-system-3.def" -D "..\..\bin\csfml-system-3.dll" -l "libcsfml-system.a"
179179 Remove-Item -Path "csfml-system-3.def"
180180 Pop-Location
181181
182- New-Item -ItemType "directory" -PATH "install"
182+ New-Item -ItemType "directory" -PATH "install\CSFML "
183183 Move-Item -Path "CSFML-install\*" -Destination "install\CSFML"
184184
185185 - name : Upload Artifact
@@ -212,7 +212,7 @@ jobs:
212212 -DCMAKE_CXX_COMPILER="/usr/bin/clang++" \
213213 -DCMAKE_C_FLAGS="-stdlib=libc++" \
214214 -DCMAKE_CXX_FLAGS="-stdlib=libc++" \
215- -DBUILD_SHARED_LIBS=TRUE \
215+ -DBUILD_SHARED_LIBS=ON \
216216 -DCMAKE_BUILD_TYPE=Release \
217217 -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/SFML-install \
218218 -DCMAKE_OSX_ARCHITECTURES=x86_64 \
@@ -228,8 +228,7 @@ jobs:
228228 -DCMAKE_CXX_COMPILER="/usr/bin/clang++" \
229229 -DCMAKE_C_FLAGS="-stdlib=libc++" \
230230 -DCMAKE_CXX_FLAGS="-stdlib=libc++" \
231- -DBUILD_SHARED_LIBS=TRUE \
232- -DCSFML_LINK_SFML_STATICALLY=FALSE \
231+ -DBUILD_SHARED_LIBS=ON \
233232 -DCMAKE_BUILD_TYPE=Release \
234233 -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/CSFML-install \
235234 -DCMAKE_OSX_ARCHITECTURES=x86_64 \
@@ -275,7 +274,7 @@ jobs:
275274 -DCMAKE_CXX_COMPILER="/usr/bin/clang++" \
276275 -DCMAKE_C_FLAGS="-stdlib=libc++" \
277276 -DCMAKE_CXX_FLAGS="-stdlib=libc++" \
278- -DBUILD_SHARED_LIBS=TRUE \
277+ -DBUILD_SHARED_LIBS=ON \
279278 -DCMAKE_BUILD_TYPE=Release \
280279 -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/SFML-install \
281280 -DCMAKE_OSX_ARCHITECTURES=arm64 \
@@ -291,8 +290,7 @@ jobs:
291290 -DCMAKE_CXX_COMPILER="/usr/bin/clang++" \
292291 -DCMAKE_C_FLAGS="-stdlib=libc++" \
293292 -DCMAKE_CXX_FLAGS="-stdlib=libc++" \
294- -DBUILD_SHARED_LIBS=TRUE \
295- -DCSFML_LINK_SFML_STATICALLY=FALSE \
293+ -DBUILD_SHARED_LIBS=ON \
296294 -DCMAKE_BUILD_TYPE=Release \
297295 -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/CSFML-install \
298296 -DCMAKE_OSX_ARCHITECTURES=arm64 \
0 commit comments