@@ -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
8686 Pop-Location
8787
8888 New-Item -ItemType "directory" -PATH "install"
89+ New-Item -ItemType "directory" -PATH "install\bin"
90+ Move-Item -Path "CSFML-install\*.dll" -Destination "install\CSFML\bin"
8991 Move-Item -Path "CSFML-install\*" -Destination "install\CSFML"
9092
9193 - name : Upload Artifact
@@ -131,12 +133,12 @@ jobs:
131133
132134 - name : Build SFML
133135 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
136+ 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
135137 cmake --build SFML-build --config Release --target install
136138
137139 - name : Build CSFML
138140 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
141+ 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
140142 cmake --build CSFML-build --config Release --target install
141143
142144 - name : Add MinGW to PATH
@@ -173,6 +175,8 @@ jobs:
173175 Pop-Location
174176
175177 New-Item -ItemType "directory" -PATH "install"
178+ New-Item -ItemType "directory" -PATH "install\bin"
179+ Move-Item -Path "CSFML-install\*.dll" -Destination "install\CSFML\bin"
176180 Move-Item -Path "CSFML-install\*" -Destination "install\CSFML"
177181
178182 - name : Upload Artifact
@@ -205,7 +209,7 @@ jobs:
205209 -DCMAKE_CXX_COMPILER="/usr/bin/clang++" \
206210 -DCMAKE_C_FLAGS="-stdlib=libc++" \
207211 -DCMAKE_CXX_FLAGS="-stdlib=libc++" \
208- -DBUILD_SHARED_LIBS=TRUE \
212+ -DBUILD_SHARED_LIBS=ON \
209213 -DCMAKE_BUILD_TYPE=Release \
210214 -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/SFML-install \
211215 -DCMAKE_OSX_ARCHITECTURES=x86_64 \
@@ -221,8 +225,7 @@ jobs:
221225 -DCMAKE_CXX_COMPILER="/usr/bin/clang++" \
222226 -DCMAKE_C_FLAGS="-stdlib=libc++" \
223227 -DCMAKE_CXX_FLAGS="-stdlib=libc++" \
224- -DBUILD_SHARED_LIBS=TRUE \
225- -DCSFML_LINK_SFML_STATICALLY=FALSE \
228+ -DBUILD_SHARED_LIBS=ON \
226229 -DCMAKE_BUILD_TYPE=Release \
227230 -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/CSFML-install \
228231 -DCMAKE_OSX_ARCHITECTURES=x86_64 \
@@ -268,7 +271,7 @@ jobs:
268271 -DCMAKE_CXX_COMPILER="/usr/bin/clang++" \
269272 -DCMAKE_C_FLAGS="-stdlib=libc++" \
270273 -DCMAKE_CXX_FLAGS="-stdlib=libc++" \
271- -DBUILD_SHARED_LIBS=TRUE \
274+ -DBUILD_SHARED_LIBS=ON \
272275 -DCMAKE_BUILD_TYPE=Release \
273276 -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/SFML-install \
274277 -DCMAKE_OSX_ARCHITECTURES=arm64 \
@@ -284,8 +287,7 @@ jobs:
284287 -DCMAKE_CXX_COMPILER="/usr/bin/clang++" \
285288 -DCMAKE_C_FLAGS="-stdlib=libc++" \
286289 -DCMAKE_CXX_FLAGS="-stdlib=libc++" \
287- -DBUILD_SHARED_LIBS=TRUE \
288- -DCSFML_LINK_SFML_STATICALLY=FALSE \
290+ -DBUILD_SHARED_LIBS=ON \
289291 -DCMAKE_BUILD_TYPE=Release \
290292 -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/CSFML-install \
291293 -DCMAKE_OSX_ARCHITECTURES=arm64 \
0 commit comments