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

CMakeLists: move sentry back in, add C to languages

Browse Source
This commit is contained in:
Lion Kortlepel 2021-08-10 10:31:43 +02:00 committed by Lion
parent 2774a73d83
commit b3a8b1a682
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -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 \ message(STATUS "You can find build instructions and a list of dependencies in the README at \
https://github.com/BeamMP/BeamMP-Server") https://github.com/BeamMP/BeamMP-Server")
add_subdirectory("include/sentry-native")
# ---- start of CXX section ----- # ---- start of CXX section -----
project(BeamMP-Server project(BeamMP-Server
DESCRIPTION "Server for BeamMP - The Multiplayer Mod for BeamNG.drive" DESCRIPTION "Server for BeamMP - The Multiplayer Mod for BeamNG.drive"
HOMEPAGE_URL https://beammp.com HOMEPAGE_URL https://beammp.com
LANGUAGES CXX) LANGUAGES CXX C)
add_subdirectory("include/sentry-native")
message(STATUS "Setting compiler flags") message(STATUS "Setting compiler flags")
if (WIN32) if (WIN32)

4
src/TNetwork.cpp
View File

@ -452,7 +452,7 @@ std::string TNetwork::TCPRcv(TClient& c) {
#endif // DEBUG #endif // DEBUG
if (!CheckBytes(c, BytesRcv)) { if (!CheckBytes(c, BytesRcv)) {
#ifdef DEBUG #ifdef DEBUG
error(std::string(__func__) + (": failed on CheckBytes")); warn(std::string(__func__) + (": failed on CheckBytes"));
#endif // DEBUG #endif // DEBUG
return ""; return "";
} }
@ -468,7 +468,7 @@ std::string TNetwork::TCPRcv(TClient& c) {
Temp = recv(c.GetTCPSock(), &Data[BytesRcv], Header - BytesRcv, 0); Temp = recv(c.GetTCPSock(), &Data[BytesRcv], Header - BytesRcv, 0);
if (!CheckBytes(c, Temp)) { if (!CheckBytes(c, Temp)) {
#ifdef DEBUG #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 #endif // DEBUG
return ""; return "";

1
src/main.cpp
View File

@ -55,7 +55,6 @@ int main(int argc, char** argv) try {
bool Shutdown = false; bool Shutdown = false;
Application::RegisterShutdownHandler([&Shutdown] { Shutdown = true; }); Application::RegisterShutdownHandler([&Shutdown] { Shutdown = true; });
TServer Server(argc, argv); TServer Server(argc, argv);
TConfig Config; TConfig Config;