BeamMP/BeamMP-Server
1
0
Fork 0
mirror of https://github.com/BeamMP/BeamMP-Server.git synced 2025-07-04 00:36:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove libzip

Browse Source
This commit is contained in:
Lion Kortlepel 2021-11-06 13:03:20 +01:00
parent fdc205f521
commit 9f5fa8fb9b
No known key found for this signature in database
GPG Key ID: 4322FF2B4C71259B
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -30,9 +30,6 @@ endif()
set(SENTRY_BACKEND breakpad) set(SENTRY_BACKEND breakpad)
add_subdirectory("deps/sentry-native") add_subdirectory("deps/sentry-native")
set(BUILD_SHARED_LIBS OFF)
add_subdirectory("deps/libzip")
message(STATUS "Setting compiler flags") message(STATUS "Setting compiler flags")
if (WIN32) if (WIN32)
@ -95,7 +92,7 @@ add_executable(BeamMP-Server
include/SignalHandling.h src/SignalHandling.cpp) include/SignalHandling.h src/SignalHandling.cpp)
target_compile_definitions(BeamMP-Server PRIVATE SECRET_SENTRY_URL="${BEAMMP_SECRET_SENTRY_URL}") target_compile_definitions(BeamMP-Server PRIVATE SECRET_SENTRY_URL="${BEAMMP_SECRET_SENTRY_URL}")
include_directories(BeamMP-Server PUBLIC ${libzip_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}/include) include_directories(BeamMP-Server PUBLIC ${Boost_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}/include)
target_include_directories(BeamMP-Server PUBLIC target_include_directories(BeamMP-Server PUBLIC
"${CMAKE_CURRENT_SOURCE_DIR}/include" "${CMAKE_CURRENT_SOURCE_DIR}/include"
@ -115,7 +112,7 @@ message(STATUS "Looking for SSL")
find_package(OpenSSL REQUIRED) find_package(OpenSSL REQUIRED)
target_link_libraries(BeamMP-Server sol2::sol2 ${LUA_LIBRARIES} libzip::zip) target_link_libraries(BeamMP-Server sol2::sol2 ${LUA_LIBRARIES})
message(STATUS "CURL IS ${CURL_LIBRARIES}") message(STATUS "CURL IS ${CURL_LIBRARIES}")
if (UNIX) if (UNIX)

9
src/TConsole.cpp
View File

@ -35,6 +35,14 @@ std::string GetDate() {
void TConsole::BackupOldLog() { void TConsole::BackupOldLog() {
fs::path Path = "Server.log"; fs::path Path = "Server.log";
if (fs::exists(Path)) { if (fs::exists(Path)) {
auto OldLog = Path.filename().stem().string() + ".old.log";
try {
fs::rename(Path, OldLog);
beammp_debug("renamed old log file to '" + OldLog + "'");
} catch (const std::exception& e) {
beammp_warn(e.what());
}
/*
int err = 0; int err = 0;
zip* z = zip_open("ServerLogs.zip", ZIP_CREATE, &err); zip* z = zip_open("ServerLogs.zip", ZIP_CREATE, &err);
if (!z) { if (!z) {
@ -68,6 +76,7 @@ void TConsole::BackupOldLog() {
zip_file_add(z, NewName.c_str(), s, 0); zip_file_add(z, NewName.c_str(), s, 0);
zip_close(z); zip_close(z);
*/
} }
} }

2
src/TPPSMonitor.cpp
View File

@ -21,7 +21,7 @@ void TPPSMonitor::operator()() {
// hard spi // hard spi
std::this_thread::sleep_for(std::chrono::milliseconds(1)); std::this_thread::sleep_for(std::chrono::milliseconds(1));
} }
beammp_info("PPSMonitor starting"); beammp_debug("PPSMonitor starting");
std::vector<std::shared_ptr<TClient>> TimedOutClients; std::vector<std::shared_ptr<TClient>> TimedOutClients;
while (!mShutdown) { while (!mShutdown) {
std::this_thread::sleep_for(std::chrono::seconds(1)); std::this_thread::sleep_for(std::chrono::seconds(1));