etc
/
furnace
mirror of https://github.com/tildearrow/furnace.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "fudge and bread" 

This reverts commit 6afe29682d.
This commit is contained in:
tildearrow 2022-05-29 00:44:21 -05:00
parent 7687a64000
commit cdcf87c773
3 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -509,7 +509,7 @@ endif()
set(USED_SOURCES ${ENGINE_SOURCES} ${AUDIO_SOURCES} src/main.cpp) set(USED_SOURCES ${ENGINE_SOURCES} ${AUDIO_SOURCES} src/main.cpp)
if (USE_BACKWARD) 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") if (WIN32 AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
list(APPEND DEPENDENCIES_LIBRARIES dbghelp psapi) list(APPEND DEPENDENCIES_LIBRARIES dbghelp psapi)
endif() endif()

8
src/backtrace.cpp
View File

@ -39,12 +39,4 @@ namespace backward {
backward::SignalHandling sh; backward::SignalHandling sh;
void checkInitialized() {
if (!sh.loaded()) {
#ifdef _WIN32
MessageBox(NULL,"Warning","crash backtrace not available!",MB_OK|MB_ICONWARNING);
#endif
}
}
} // namespace backward } // namespace backward

11
src/main.cpp
View File

@ -39,10 +39,6 @@
#include "gui/gui.h" #include "gui/gui.h"
#endif #endif
#ifdef HAVE_BACKWARD
#include "../extern/backward/backward.hpp"
#endif
DivEngine e; DivEngine e;
#ifdef HAVE_GUI #ifdef HAVE_GUI
@ -246,7 +242,6 @@ void initParams() {
// TODO: CoInitializeEx on Windows? // TODO: CoInitializeEx on Windows?
// TODO: add crash log // TODO: add crash log
int main(int argc, char** argv) { int main(int argc, char** argv) {
backward::SignalHandling sh;
initLog(); initLog();
#if !(defined(__APPLE__) || defined(_WIN32) || defined(ANDROID)) #if !(defined(__APPLE__) || defined(_WIN32) || defined(ANDROID))
// workaround for Wayland HiDPI issue // 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); e.setConsoleMode(consoleMode);
#ifdef _WIN32 #ifdef _WIN32