summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVittorio Romeo <vittorio.romeo@outlook.com>2022-01-08 18:26:58 +0100
committerVittorio Romeo <vittorio.romeo@outlook.com>2022-01-08 18:26:58 +0100
commite7d04e09a6e9b2751847267f70a64f8e419ffaa2 (patch)
treed8c5af4eadd1cf6b2463a9beba3cc3154a63f8a8
parent47373e23414f55acb7c95b91c8be845663a976aa (diff)
Fix sleep bug by reverting SFML time changes
-rw-r--r--CMakeLists.txt2
-rw-r--r--_RELEASE/config.json2
-rw-r--r--buildrel/copylibs.sh86
3 files changed, 25 insertions, 65 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c585f4c8..820d5e80 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -95,7 +95,7 @@ set(SFML_STATIC_LIBRARIES false)
CPMAddPackage(
NAME SFML
GITHUB_REPOSITORY vittorioromeo/SFML
- GIT_TAG 596955141c9d6550aeeea196297d07f8b9143645
+ GIT_TAG 8367c36d745655f16b0c5f3b4de8ede40e28941e
)
set_target_properties(sfml-system PROPERTIES UNITY_BUILD ON)
diff --git a/_RELEASE/config.json b/_RELEASE/config.json
index aaf9ef24..e489c496 100644
--- a/_RELEASE/config.json
+++ b/_RELEASE/config.json
@@ -145,7 +145,7 @@
"vanitylevels_Vipre_Vanity_10006_troglodyte_m_1.002"
],
"server_port" : 50505,
- "show_fps" : false,
+ "show_fps" : true,
"show_key_icons" : false,
"show_level_info" : false,
"show_login_at_startup" : false,
diff --git a/buildrel/copylibs.sh b/buildrel/copylibs.sh
index 830bfbbe..0bbaaa60 100644
--- a/buildrel/copylibs.sh
+++ b/buildrel/copylibs.sh
@@ -1,68 +1,28 @@
#!/bin/bash
-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-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/ &
-cp ./_deps/luajit-build/src/libluajit.dll ../_RELEASE/ &
-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-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/ &
-cp ./_deps/luajit-build/src/libluajit.dll ./test/ &
-cp ./_deps/zlib-build/libzlib1.dll ./test/ &
-
-cp /c/msys64/mingw64/bin/libssp-0.dll ../_RELEASE/ &
-cp /c/msys64/mingw64/bin/libssp-0.dll ./test/ &
-
-cp /c/msys64/mingw64/bin/libstdc++-6.dll ../_RELEASE/ &
-cp /c/msys64/mingw64/bin/libstdc++-6.dll ./test/ &
-
-cp /c/msys64/mingw64/bin/libgcc_s_seh-1.dll ../_RELEASE/ &
-cp /c/msys64/mingw64/bin/libgcc_s_seh-1.dll ./test/ &
-
-cp /c/msys64/mingw64/bin/libwinpthread-1.dll ../_RELEASE/ &
-cp /c/msys64/mingw64/bin/libwinpthread-1.dll ./test/ &
+function copyTo
+{
+ cp ./_deps/imgui-sfml-build/libImGui-SFML.dll $1 &
+
+ cp ./_deps/sfml-build/lib/sfml-graphics-3.dll $1 &
+ cp ./_deps/sfml-build/lib/sfml-system-3.dll $1 &
+ cp ./_deps/sfml-build/lib/sfml-window-3.dll $1 &
+ cp ./_deps/sfml-build/lib/sfml-network-3.dll $1 &
+ cp ./_deps/sfml-build/lib/sfml-audio-3.dll $1 &
+
+ cp ./_deps/sfml-src/extlibs/bin/x64/openal32.dll $1 &
+ cp ./_deps/libsodium-cmake-build/libsodium.dll $1 &
+ cp ./_deps/luajit-build/src/libluajit.dll $1 &
+ cp ./_deps/zlib-build/libzlib1.dll $1 &
+
+ cp /c/msys64/mingw64/bin/libssp-0.dll $1 &
+ cp /c/msys64/mingw64/bin/libstdc++-6.dll $1 &
+ cp /c/msys64/mingw64/bin/libgcc_s_seh-1.dll $1 &
+ cp /c/msys64/mingw64/bin/libwinpthread-1.dll $1 &
+}
+
+copyTo "../_RELEASE"
+copyTo "./test"
cp ../_RELEASE/discord_game_sdk.dll ./test &
cp ../_RELEASE/steam_api64.dll ./test &