BeamMP/BeamMP-Server
1
0
Fork 0
mirror of https://github.com/BeamMP/BeamMP-Server.git synced 2025-07-03 08:15:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix some sentry and linking related issues

Browse Source
This commit is contained in:
Lion Kortlepel 2022-05-26 11:51:26 +02:00
parent 019c5202ea
commit bc1628afeb
No known key found for this signature in database
GPG Key ID: 4322FF2B4C71259B
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -125,7 +125,6 @@ set(BeamMP_Sources
set(BeamMP_Includes set(BeamMP_Includes
"${CMAKE_CURRENT_SOURCE_DIR}/include" "${CMAKE_CURRENT_SOURCE_DIR}/include"
"${CMAKE_CURRENT_SOURCE_DIR}/commandline" "${CMAKE_CURRENT_SOURCE_DIR}/commandline"
"${CMAKE_CURRENT_SOURCE_DIR}/include"
${LUA_INCLUDE_DIR} ${LUA_INCLUDE_DIR}
${CURL_INCLUDE_DIRS} ${CURL_INCLUDE_DIRS}
"include/tomlplusplus" "include/tomlplusplus"
@ -155,7 +154,6 @@ if (WIN32)
endif () endif ()
# ------------------------ BEAMMP SERVER ----------------------------- # ------------------------ BEAMMP SERVER -----------------------------
# ------------------------ BEAMMP SERVER TESTS -----------------------
add_executable(BeamMP-Server add_executable(BeamMP-Server
src/main.cpp src/main.cpp
@ -188,7 +186,6 @@ if(BUILD_TESTS)
target_compile_definitions(BeamMP-Server-tests PRIVATE target_compile_definitions(BeamMP-Server-tests PRIVATE
${BeamMP_Definitions} ${BeamMP_Definitions}
DOCTEST_CONFIG_DISABLE
) )
target_include_directories(BeamMP-Server-tests PUBLIC target_include_directories(BeamMP-Server-tests PUBLIC

3
src/Common.cpp
View File

@ -12,6 +12,9 @@
#include "CustomAssert.h" #include "CustomAssert.h"
#include "Http.h" #include "Http.h"
// global, yes, this is ugly, no, it cant be done another way
TSentry Sentry {};
Application::TSettings Application::Settings = {}; Application::TSettings Application::Settings = {};
void Application::RegisterShutdownHandler(const TShutdownHandler& Handler) { void Application::RegisterShutdownHandler(const TShutdownHandler& Handler) {

4
src/main.cpp
View File

@ -44,10 +44,6 @@ EXAMPLES:
'MyWestCoastServerConfig.toml'. 'MyWestCoastServerConfig.toml'.
)"; )";
// this is provided by the build system, leave empty for source builds
// global, yes, this is ugly, no, it cant be done another way
TSentry Sentry {};
struct MainArguments { struct MainArguments {
int argc {}; int argc {};
char** argv {}; char** argv {};