Update to SFML 3.x

4 files changed, 53 insertions, 53 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f611f82a..a2ca60ac 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -95,7 +95,7 @@ set(SFML_STATIC_LIBRARIES false)
 CPMAddPackage(
     NAME SFML
     GITHUB_REPOSITORY SuperV1234/SFML
-    GIT_TAG 8d21b3a33cb1c4b8333ca5e4dd2f203b855b8ada
+    GIT_TAG ab41e083f6de91c3440bd04341b73f89d69f7975
 )
 
 set_target_properties(sfml-system PROPERTIES UNITY_BUILD ON)
diff --git a/build.sh b/build.sh
index 04f66f39..ca3e9786 100755
--- a/build.sh
+++ b/build.sh
@@ -47,7 +47,7 @@ while [[ $# -gt 0 ]]; do
             VALGRIND=1
             shift
             ;;
-        
+
         -g|--regenerate-cmake)
             REGENERATE_CMAKE=1
             shift
@@ -95,11 +95,11 @@ case $OSTYPE in
     # MinGW / Windows...
     "msys")
         # Removes existing library artifacts
-        rm -f "$RELEASE_DIR/sfml-audio-2.dll"
-        rm -f "$RELEASE_DIR/sfml-graphics-2.dll"
-        rm -f "$RELEASE_DIR/sfml-network-2.dll"
-        rm -f "$RELEASE_DIR/sfml-system-2.dll"
-        rm -f "$RELEASE_DIR/sfml-window-2.dll"
+        rm -f "$RELEASE_DIR/sfml-audio-3.dll"
+        rm -f "$RELEASE_DIR/sfml-graphics-3.dll"
+        rm -f "$RELEASE_DIR/sfml-network-3.dll"
+        rm -f "$RELEASE_DIR/sfml-system-3.dll"
+        rm -f "$RELEASE_DIR/sfml-window-3.dll"
         rm -f "$RELEASE_DIR/openal32.dll"
         rm -f "$RELEASE_DIR/libzlib1.dll"
         rm -f "$RELEASE_DIR/OHWorkshopUploader.exe"
@@ -120,19 +120,19 @@ case $OSTYPE in
 
         echo "Building for MinGW/Windows..."
         make $THREAD_MAKE_COUNT
-        
+
         # Moves artifacts to release folder
-        mv ./_deps/sfml-build/lib/sfml-audio-2.dll $RELEASE_DIR
-        mv ./_deps/sfml-build/lib/sfml-graphics-2.dll $RELEASE_DIR
-        mv ./_deps/sfml-build/lib/sfml-network-2.dll $RELEASE_DIR
-        mv ./_deps/sfml-build/lib/sfml-system-2.dll $RELEASE_DIR
-        mv ./_deps/sfml-build/lib/sfml-window-2.dll $RELEASE_DIR
+        mv ./_deps/sfml-build/lib/sfml-audio-3.dll $RELEASE_DIR
+        mv ./_deps/sfml-build/lib/sfml-graphics-3.dll $RELEASE_DIR
+        mv ./_deps/sfml-build/lib/sfml-network-3.dll $RELEASE_DIR
+        mv ./_deps/sfml-build/lib/sfml-system-3.dll $RELEASE_DIR
+        mv ./_deps/sfml-build/lib/sfml-window-3.dll $RELEASE_DIR
         cp ./_deps/sfml-src/extlibs/bin/x64/openal32.dll $RELEASE_DIR
         mv ./_deps/zlib-build/libzlib1.dll $RELEASE_DIR
         mv ./OHWorkshopUploader.exe $RELEASE_DIR
         mv ./SSVOpenHexagon.exe $RELEASE_DIR
         ;;
-    
+
     # Linux...
     "linux-gnu")
         # Removes existing executables
diff --git a/buildrel/copylibs.sh b/buildrel/copylibs.sh
index 3d3742d3..0c60afa8 100644
--- a/buildrel/copylibs.sh
+++ b/buildrel/copylibs.sh
@@ -3,23 +3,23 @@
 cp ./_deps/imgui-sfml-build/libImGui-SFML_d.dll ../_RELEASE/ &
 cp ./_deps/imgui-sfml-build/libImGui-SFML.dll ../_RELEASE/ &
 
-cp ./_deps/sfml-build/lib/libsfml-graphics-d-2.dll ../_RELEASE/ &
-cp ./_deps/sfml-build/lib/libsfml-system-d-2.dll ../_RELEASE/ &
-cp ./_deps/sfml-build/lib/libsfml-window-d-2.dll ../_RELEASE/ &
-cp ./_deps/sfml-build/lib/libsfml-network-d-2.dll ../_RELEASE/ &
-cp ./_deps/sfml-build/lib/libsfml-audio-d-2.dll ../_RELEASE/ &
-
-cp ./_deps/sfml-build/lib/sfml-graphics-2.dll ../_RELEASE/ &
-cp ./_deps/sfml-build/lib/sfml-system-2.dll ../_RELEASE/ &
-cp ./_deps/sfml-build/lib/sfml-window-2.dll ../_RELEASE/ &
-cp ./_deps/sfml-build/lib/sfml-network-2.dll ../_RELEASE/ &
-cp ./_deps/sfml-build/lib/sfml-audio-2.dll ../_RELEASE/ &
-
-cp ./_deps/sfml-build/lib/libsfml-graphics-2.dll ../_RELEASE/ &
-cp ./_deps/sfml-build/lib/libsfml-system-2.dll ../_RELEASE/ &
-cp ./_deps/sfml-build/lib/libsfml-window-2.dll ../_RELEASE/ &
-cp ./_deps/sfml-build/lib/libsfml-network-2.dll ../_RELEASE/ &
-cp ./_deps/sfml-build/lib/libsfml-audio-2.dll ../_RELEASE/ &
+cp ./_deps/sfml-build/lib/libsfml-graphics-d-3.dll ../_RELEASE/ &
+cp ./_deps/sfml-build/lib/libsfml-system-d-3.dll ../_RELEASE/ &
+cp ./_deps/sfml-build/lib/libsfml-window-d-3.dll ../_RELEASE/ &
+cp ./_deps/sfml-build/lib/libsfml-network-d-3.dll ../_RELEASE/ &
+cp ./_deps/sfml-build/lib/libsfml-audio-d-3.dll ../_RELEASE/ &
+
+cp ./_deps/sfml-build/lib/sfml-graphics-3.dll ../_RELEASE/ &
+cp ./_deps/sfml-build/lib/sfml-system-3.dll ../_RELEASE/ &
+cp ./_deps/sfml-build/lib/sfml-window-3.dll ../_RELEASE/ &
+cp ./_deps/sfml-build/lib/sfml-network-3.dll ../_RELEASE/ &
+cp ./_deps/sfml-build/lib/sfml-audio-3.dll ../_RELEASE/ &
+
+cp ./_deps/sfml-build/lib/libsfml-graphics-3.dll ../_RELEASE/ &
+cp ./_deps/sfml-build/lib/libsfml-system-3.dll ../_RELEASE/ &
+cp ./_deps/sfml-build/lib/libsfml-window-3.dll ../_RELEASE/ &
+cp ./_deps/sfml-build/lib/libsfml-network-3.dll ../_RELEASE/ &
+cp ./_deps/sfml-build/lib/libsfml-audio-3.dll ../_RELEASE/ &
 
 cp ./_deps/sfml-src/extlibs/bin/x64/openal32.dll ../_RELEASE/ &
 cp ./_deps/libsodium-cmake-build/libsodium.dll ../_RELEASE/ &
@@ -29,23 +29,23 @@ cp ./_deps/zlib-build/libzlib1.dll ../_RELEASE/ &
 cp ./_deps/imgui-sfml-build/libImGui-SFML_d.dll ./test/ &
 cp ./_deps/imgui-sfml-build/libImGui-SFML.dll ./test/ &
 
-cp ./_deps/sfml-build/lib/libsfml-graphics-d-2.dll ./test/ &
-cp ./_deps/sfml-build/lib/libsfml-system-d-2.dll ./test/ &
-cp ./_deps/sfml-build/lib/libsfml-window-d-2.dll ./test/ &
-cp ./_deps/sfml-build/lib/libsfml-network-d-2.dll ./test/ &
-cp ./_deps/sfml-build/lib/libsfml-audio-d-2.dll ./test/ &
-
-cp ./_deps/sfml-build/lib/sfml-graphics-2.dll ./test/ &
-cp ./_deps/sfml-build/lib/sfml-system-2.dll ./test/ &
-cp ./_deps/sfml-build/lib/sfml-window-2.dll ./test/ &
-cp ./_deps/sfml-build/lib/sfml-network-2.dll ./test/ &
-cp ./_deps/sfml-build/lib/sfml-audio-2.dll ./test/ &
-
-cp ./_deps/sfml-build/lib/libsfml-graphics-2.dll ./test/ &
-cp ./_deps/sfml-build/lib/libsfml-system-2.dll ./test/ &
-cp ./_deps/sfml-build/lib/libsfml-window-2.dll ./test/ &
-cp ./_deps/sfml-build/lib/libsfml-network-2.dll ./test/ &
-cp ./_deps/sfml-build/lib/libsfml-audio-2.dll ./test/ &
+cp ./_deps/sfml-build/lib/libsfml-graphics-d-3.dll ./test/ &
+cp ./_deps/sfml-build/lib/libsfml-system-d-3.dll ./test/ &
+cp ./_deps/sfml-build/lib/libsfml-window-d-3.dll ./test/ &
+cp ./_deps/sfml-build/lib/libsfml-network-d-3.dll ./test/ &
+cp ./_deps/sfml-build/lib/libsfml-audio-d-3.dll ./test/ &
+
+cp ./_deps/sfml-build/lib/sfml-graphics-3.dll ./test/ &
+cp ./_deps/sfml-build/lib/sfml-system-3.dll ./test/ &
+cp ./_deps/sfml-build/lib/sfml-window-3.dll ./test/ &
+cp ./_deps/sfml-build/lib/sfml-network-3.dll ./test/ &
+cp ./_deps/sfml-build/lib/sfml-audio-3.dll ./test/ &
+
+cp ./_deps/sfml-build/lib/libsfml-graphics-3.dll ./test/ &
+cp ./_deps/sfml-build/lib/libsfml-system-3.dll ./test/ &
+cp ./_deps/sfml-build/lib/libsfml-window-3.dll ./test/ &
+cp ./_deps/sfml-build/lib/libsfml-network-3.dll ./test/ &
+cp ./_deps/sfml-build/lib/libsfml-audio-3.dll ./test/ &
 
 cp ./_deps/sfml-src/extlibs/bin/x64/openal32.dll ./test/ &
 cp ./_deps/libsodium-cmake-build/libsodium.dll ./test/ &
diff --git a/prepare_release.sh b/prepare_release.sh
index 731c3bb2..76d11032 100644
--- a/prepare_release.sh
+++ b/prepare_release.sh
@@ -21,11 +21,11 @@ cp ./_RELEASE/SSVOpenHexagon-Console.exe ./_PREPARED_RELEASE
 
 cp ./_RELEASE/libzlib1.dll ./_PREPARED_RELEASE
 cp ./_RELEASE/openal32.dll ./_PREPARED_RELEASE
-cp ./_RELEASE/sfml-audio-2.dll ./_PREPARED_RELEASE
-cp ./_RELEASE/sfml-graphics-2.dll ./_PREPARED_RELEASE
-cp ./_RELEASE/sfml-network-2.dll ./_PREPARED_RELEASE
-cp ./_RELEASE/sfml-system-2.dll ./_PREPARED_RELEASE
-cp ./_RELEASE/sfml-window-2.dll ./_PREPARED_RELEASE
+cp ./_RELEASE/sfml-audio-3.dll ./_PREPARED_RELEASE
+cp ./_RELEASE/sfml-graphics-3.dll ./_PREPARED_RELEASE
+cp ./_RELEASE/sfml-network-3.dll ./_PREPARED_RELEASE
+cp ./_RELEASE/sfml-system-3.dll ./_PREPARED_RELEASE
+cp ./_RELEASE/sfml-window-3.dll ./_PREPARED_RELEASE
 cp ./_RELEASE/libImGui-SFML.dll ./_PREPARED_RELEASE
 cp ./_RELEASE/libluajit.dll ./_PREPARED_RELEASE
 cp ./_RELEASE/steam_api64.dll ./_PREPARED_RELEASE