citra-emu
/
citra
Archived
1
0
Fork 0
Code

common: Only use libbacktrace if present. (#6827)

This commit is contained in:
Steveice10 2023-07-31 14:24:27 -07:00 committed by GitHub
parent 335fb78c5c
commit 3fedc68230
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/common/CMakeLists.txt
View File

@ -176,6 +176,9 @@ endif()
if (CITRA_USE_PRECOMPILED_HEADERS) if (CITRA_USE_PRECOMPILED_HEADERS)
target_precompile_headers(citra_common PRIVATE precompiled_headers.h) target_precompile_headers(citra_common PRIVATE precompiled_headers.h)
endif() endif()
if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" AND CMAKE_CXX_COMPILER_ID STREQUAL GNU)
target_link_libraries(citra_common PRIVATE backtrace dl) find_library(BACKTRACE_LIBRARY backtrace)
if (BACKTRACE_LIBRARY AND ${CMAKE_SYSTEM_NAME} STREQUAL "Linux" AND CMAKE_CXX_COMPILER_ID STREQUAL GNU)
target_link_libraries(citra_common PRIVATE ${BACKTRACE_LIBRARY} dl)
target_compile_definitions(citra_common PRIVATE CITRA_LINUX_GCC_BACKTRACE)
endif() endif()

3
src/common/logging/backend.cpp
View File

@ -13,12 +13,11 @@
#define _SH_DENYWR 0 #define _SH_DENYWR 0
#endif #endif
#if defined(__linux__) && defined(__GNUG__) && !defined(__clang__) #ifdef CITRA_LINUX_GCC_BACKTRACE
#define BOOST_STACKTRACE_USE_BACKTRACE #define BOOST_STACKTRACE_USE_BACKTRACE
#include <boost/stacktrace.hpp> #include <boost/stacktrace.hpp>
#undef BOOST_STACKTRACE_USE_BACKTRACE #undef BOOST_STACKTRACE_USE_BACKTRACE
#include <signal.h> #include <signal.h>
#define CITRA_LINUX_GCC_BACKTRACE
#endif #endif
#include "common/bounded_threadsafe_queue.h" #include "common/bounded_threadsafe_queue.h"