diff options
| author | Vittorio Romeo <vittorio.romeo@outlook.com> | 2022-01-08 14:00:40 +0100 |
|---|---|---|
| committer | Vittorio Romeo <vittorio.romeo@outlook.com> | 2022-01-08 14:00:40 +0100 |
| commit | 32484802abb462d07f434b9f79335532a7c651f9 (patch) | |
| tree | c35f82a3958dabeb65e0011039c91cbf9b86f6f8 | |
| parent | 2a6e7879bdce84595513c59c6ae6eb7e9d3830c9 (diff) | |
update libs
| -rw-r--r-- | CMakeLists.txt | 8 | ||||
| -rw-r--r-- | _RELEASE/config.json | 2 | ||||
| -rw-r--r-- | build/copylibs.sh | 1 | ||||
| -rw-r--r-- | buildrel/copylibs.sh | 1 |
4 files changed, 7 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 0eb944ab..c585f4c8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -63,7 +63,7 @@ endif() # CPM # ----------------------------------------------------------------------------- -set(CPM_DOWNLOAD_VERSION 0.32.0) +set(CPM_DOWNLOAD_VERSION 0.34.0) if(CPM_SOURCE_CACHE) set(CPM_DOWNLOAD_LOCATION "${CPM_SOURCE_CACHE}/cpm/CPM_${CPM_DOWNLOAD_VERSION}.cmake") @@ -95,7 +95,7 @@ set(SFML_STATIC_LIBRARIES false) CPMAddPackage( NAME SFML GITHUB_REPOSITORY vittorioromeo/SFML - GIT_TAG 8d88c9dc9c506760a37af0b1bd1f924ecdbd587f + GIT_TAG 596955141c9d6550aeeea196297d07f8b9143645 ) set_target_properties(sfml-system PROPERTIES UNITY_BUILD ON) @@ -117,7 +117,7 @@ set(LUAJIT_DISABLE_FFI ON CACHE BOOL "" FORCE) CPMAddPackage( NAME luajit GIT_REPOSITORY https://github.com/vittorioromeo/LuaJIT - GIT_TAG 1fc4827feffea4f687a3f102871a3630a5ca9ee2 + GIT_TAG 6979458f60adb6e95a8b781035c7a11913861178 ) set(LUAJIT_DISABLE_FFI true) @@ -157,7 +157,7 @@ if(NOT SSVOH_ANDROID) CPMAddPackage( NAME imgui GITHUB_REPOSITORY ocornut/imgui - GIT_TAG 270d4d0855ea3b2f66833ab1124ec475abe9df9c + GIT_TAG afffcd5810d030e24056c1a61f27a6eb632f50ed DOWNLOAD_ONLY YES ) diff --git a/_RELEASE/config.json b/_RELEASE/config.json index 1c1f1b16..20403c13 100644 --- a/_RELEASE/config.json +++ b/_RELEASE/config.json @@ -149,7 +149,7 @@ "server_local" : true,
"server_port" : 50505,
"server_verbose" : true,
- "show_fps" : false,
+ "show_fps" : true,
"show_key_icons" : false,
"show_level_info" : false,
"show_login_at_startup" : false,
diff --git a/build/copylibs.sh b/build/copylibs.sh index c396395e..c1024a47 100644 --- a/build/copylibs.sh +++ b/build/copylibs.sh @@ -54,3 +54,4 @@ cp /c/msys64/mingw64/bin/libwinpthread-1.dll ./test/ cp ../_RELEASE/discord_game_sdk.dll ./test cp ../_RELEASE/steam_api64.dll ./test +cp ../_RELEASE/sdkencryptedappticket64.dll ./test diff --git a/buildrel/copylibs.sh b/buildrel/copylibs.sh index 0c60afa8..830bfbbe 100644 --- a/buildrel/copylibs.sh +++ b/buildrel/copylibs.sh @@ -66,5 +66,6 @@ cp /c/msys64/mingw64/bin/libwinpthread-1.dll ./test/ & cp ../_RELEASE/discord_game_sdk.dll ./test & cp ../_RELEASE/steam_api64.dll ./test & +cp ../_RELEASE/sdkencryptedappticket64.dll ./test & wait |