From 2fcde5e8bace04eaa89aaf593a8587f1092d6f52 Mon Sep 17 00:00:00 2001 From: Grim Kriegor Date: Sat, 14 Jul 2018 19:08:35 +0100 Subject: [PATCH] [General] Temporarily disable the new OpenMW crash catcher This new crash catcher is preventing TES3MP from building on GNU/Linux `components/crashcatcher/crashcatcher.cpp:23:28: fatal error: SDL_messagebox.h: No such file or directory` Disable it until the developers isolate the issue and patch it --- components/CMakeLists.txt | 6 ------ components/crashcatcher/crashcatcher.hpp | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt index 3698659b6..43e9e74bd 100644 --- a/components/CMakeLists.txt +++ b/components/CMakeLists.txt @@ -210,12 +210,6 @@ add_component_dir (fallback fallback validate ) -if(NOT WIN32 AND NOT ANDROID) - add_component_dir (crashcatcher - crashcatcher - ) -endif() - set (ESM_UI ${CMAKE_SOURCE_DIR}/files/ui/contentselector.ui ) diff --git a/components/crashcatcher/crashcatcher.hpp b/components/crashcatcher/crashcatcher.hpp index fd8f0d154..e3846ae8f 100644 --- a/components/crashcatcher/crashcatcher.hpp +++ b/components/crashcatcher/crashcatcher.hpp @@ -4,7 +4,7 @@ #include #if (defined(__APPLE__) || (defined(__linux) && !defined(ANDROID)) || (defined(__unix) && !defined(ANDROID)) || defined(__posix)) - #define USE_CRASH_CATCHER 1 + #define USE_CRASH_CATCHER 0 #else #define USE_CRASH_CATCHER 0 #endif