From b3a8b1a682009f9c1c522a97a1b39dbbb67f1755 Mon Sep 17 00:00:00 2001 From: Lion Kortlepel Date: Tue, 10 Aug 2021 10:31:43 +0200 Subject: [PATCH] CMakeLists: move sentry back in, add C to languages --- CMakeLists.txt | 6 +++--- src/TNetwork.cpp | 4 ++-- src/main.cpp | 1 - 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 60b84a7..d44a055 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,13 +3,13 @@ cmake_minimum_required(VERSION 3.0) message(STATUS "You can find build instructions and a list of dependencies in the README at \ https://github.com/BeamMP/BeamMP-Server") -add_subdirectory("include/sentry-native") - # ---- start of CXX section ----- project(BeamMP-Server DESCRIPTION "Server for BeamMP - The Multiplayer Mod for BeamNG.drive" HOMEPAGE_URL https://beammp.com - LANGUAGES CXX) + LANGUAGES CXX C) + +add_subdirectory("include/sentry-native") message(STATUS "Setting compiler flags") if (WIN32) diff --git a/src/TNetwork.cpp b/src/TNetwork.cpp index d452a1c..0f90663 100644 --- a/src/TNetwork.cpp +++ b/src/TNetwork.cpp @@ -452,7 +452,7 @@ std::string TNetwork::TCPRcv(TClient& c) { #endif // DEBUG if (!CheckBytes(c, BytesRcv)) { #ifdef DEBUG - error(std::string(__func__) + (": failed on CheckBytes")); + warn(std::string(__func__) + (": failed on CheckBytes")); #endif // DEBUG return ""; } @@ -468,7 +468,7 @@ std::string TNetwork::TCPRcv(TClient& c) { Temp = recv(c.GetTCPSock(), &Data[BytesRcv], Header - BytesRcv, 0); if (!CheckBytes(c, Temp)) { #ifdef DEBUG - error(std::string(__func__) + (": failed on CheckBytes in while(BytesRcv < Header)")); + warn(std::string(__func__) + (": failed on CheckBytes in while(BytesRcv < Header)")); #endif // DEBUG return ""; diff --git a/src/main.cpp b/src/main.cpp index 62540b5..a6d8379 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -55,7 +55,6 @@ int main(int argc, char** argv) try { bool Shutdown = false; Application::RegisterShutdownHandler([&Shutdown] { Shutdown = true; }); - TServer Server(argc, argv); TConfig Config;