Enable loguru stack traces

kklobe · kklobe · commit 59328f555471 · 2023-06-28T15:51:57.000-05:00
Loguru's autodetect logic for enabling stack traces is not very robust,
so add logic to meson.build that checks for the headers included by
loguru.cpp if LOGURU_STACKTRACES=1.
diff --git a/src/config.h.in b/src/config.h.in
@@ -246,16 +246,4 @@
 // XDG_DATA_HOME or XDG_DATA_DIRS to include the --datadir.
 #mesondefine CUSTOM_DATADIR
 
-/* Loguru-related defines
- */
-
-// Prevent loguru from parsing command-line arguments with
-// with the hosts's locale-applied, because this can foul up
-// ncurses. (DOSBox also doesn't have foreign-language arguments).
-//
-#define LOGURU_USE_LOCALE 0
-
-// Redefine “assert” to call Loguru version (!NDEBUG only).
-#define LOGURU_REDEFINE_ASSERT 1
-
 #endif
diff --git a/src/libs/loguru/meson.build b/src/libs/loguru/meson.build
@@ -1,3 +1,23 @@
+# Enable Loguru stack traces if supported
+stacktrace_headers = ['cxxabi.h', 'dlfcn.h', 'execinfo.h']
+
+all_stacktrace_headers_found = true
+
+foreach header : stacktrace_headers
+    if not cxx.has_header(header)
+        all_stacktrace_headers_found = false
+    endif
+endforeach
+
+if all_stacktrace_headers_found
+    add_project_arguments('-DLOGURU_STACKTRACES=1', language: 'cpp')
+endif
+
+# Prevent loguru from parsing command-line arguments with
+# the hosts's locale-applied, because this can foul up
+# ncurses. (DOSBox also doesn't have foreign-language arguments).
+add_project_arguments('-DLOGURU_USE_LOCALE=0', language: 'cpp')
+
 libloguru = static_library(
     'loguru',
     'loguru.cpp',
diff --git a/src/platform/visualc/config.h b/src/platform/visualc/config.h
@@ -122,15 +122,3 @@
 // On Windows, this path is not customizeable, so it's left blank here.
 //
 #define CUSTOM_DATADIR ""
-
-/* Loguru-related defines
- */
-
-// Prevent loguru from parsing command-line arguments with
-// with the hosts's locale-applied, because this can foul up
-// ncurses. (DOSBox also doesn't have foreign-language arguments).
-//
-#define LOGURU_USE_LOCALE 0
-
-// Redefine “assert” to call Loguru version (!NDEBUG only).
-#define LOGURU_REDEFINE_ASSERT 1
