From bc1628afeb8f2b28123a40d132f534c6dfc0fa9d Mon Sep 17 00:00:00 2001
From: Lion Kortlepel <development@kortlepel.com>
Date: Thu, 26 May 2022 11:51:26 +0200
Subject: [PATCH] fix some sentry and linking related issues

---
 CMakeLists.txt | 3 ---
 src/Common.cpp | 3 +++
 src/main.cpp   | 4 ----
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 204b76d..3d45c23 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -125,7 +125,6 @@ set(BeamMP_Sources
 set(BeamMP_Includes
     "${CMAKE_CURRENT_SOURCE_DIR}/include"
     "${CMAKE_CURRENT_SOURCE_DIR}/commandline"
-    "${CMAKE_CURRENT_SOURCE_DIR}/include"
     ${LUA_INCLUDE_DIR}
     ${CURL_INCLUDE_DIRS}
     "include/tomlplusplus"
@@ -155,7 +154,6 @@ if (WIN32)
 endif ()
 
 # ------------------------ BEAMMP SERVER -----------------------------
-# ------------------------ BEAMMP SERVER TESTS -----------------------
 
 add_executable(BeamMP-Server
         src/main.cpp
@@ -188,7 +186,6 @@ if(BUILD_TESTS)
 
     target_compile_definitions(BeamMP-Server-tests PRIVATE
         ${BeamMP_Definitions}
-        DOCTEST_CONFIG_DISABLE
     )
 
     target_include_directories(BeamMP-Server-tests PUBLIC
diff --git a/src/Common.cpp b/src/Common.cpp
index 23c483d..77933bb 100644
--- a/src/Common.cpp
+++ b/src/Common.cpp
@@ -12,6 +12,9 @@
 #include "CustomAssert.h"
 #include "Http.h"
 
+// global, yes, this is ugly, no, it cant be done another way
+TSentry Sentry {};
+
 Application::TSettings Application::Settings = {};
 
 void Application::RegisterShutdownHandler(const TShutdownHandler& Handler) {
diff --git a/src/main.cpp b/src/main.cpp
index 99d194f..5878784 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -44,10 +44,6 @@ EXAMPLES:
         '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 {
     int argc {};
     char** argv {};