From cdcf87c773d330f2a3191c2b3edc29790f125b1a Mon Sep 17 00:00:00 2001 From: tildearrow Date: Sun, 29 May 2022 00:44:21 -0500 Subject: [PATCH] Revert "fudge and bread" This reverts commit 6afe29682d0d3687e6188b5562b9cec1df9fd148. --- CMakeLists.txt | 2 +- src/backtrace.cpp | 8 -------- src/main.cpp | 11 ----------- 3 files changed, 1 insertion(+), 20 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 347cc872..b23a9970 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -509,7 +509,7 @@ endif() set(USED_SOURCES ${ENGINE_SOURCES} ${AUDIO_SOURCES} src/main.cpp) if (USE_BACKWARD) - list(APPEND DEPENDENCIES_DEFINES HAVE_BACKWARD) + list(APPEND USED_SOURCES src/backtrace.cpp) if (WIN32 AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU") list(APPEND DEPENDENCIES_LIBRARIES dbghelp psapi) endif() diff --git a/src/backtrace.cpp b/src/backtrace.cpp index 402cb647..68a648ff 100644 --- a/src/backtrace.cpp +++ b/src/backtrace.cpp @@ -39,12 +39,4 @@ namespace backward { backward::SignalHandling sh; -void checkInitialized() { - if (!sh.loaded()) { -#ifdef _WIN32 - MessageBox(NULL,"Warning","crash backtrace not available!",MB_OK|MB_ICONWARNING); -#endif - } -} - } // namespace backward diff --git a/src/main.cpp b/src/main.cpp index 995fa6f0..07905852 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -39,10 +39,6 @@ #include "gui/gui.h" #endif -#ifdef HAVE_BACKWARD -#include "../extern/backward/backward.hpp" -#endif - DivEngine e; #ifdef HAVE_GUI @@ -246,7 +242,6 @@ void initParams() { // TODO: CoInitializeEx on Windows? // TODO: add crash log int main(int argc, char** argv) { - backward::SignalHandling sh; initLog(); #if !(defined(__APPLE__) || defined(_WIN32) || defined(ANDROID)) // workaround for Wayland HiDPI issue @@ -306,12 +301,6 @@ int main(int argc, char** argv) { } } - if (!sh.loaded()) { -#ifdef _WIN32 - MessageBox(NULL,"Warning","crash backtrace not available!",MB_OK|MB_ICONWARNING); -#endif - } - e.setConsoleMode(consoleMode); #ifdef _WIN32