Andrew/redot-engine
1
0
Fork 0
mirror of https://github.com/Redot-Engine/redot-engine.git synced 2025-12-06 07:17:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #100207 from bruvzg/mingw_dbg

Browse Source 
[Windows] Fix MinGW debug symbols.
This commit is contained in:
Thaddeus Crews
2024-12-10 14:16:06 -06:00
parent ba89529390 404383e161
commit 3cb8419703
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
SConstruct
View File

@@ -731,9 +731,12 @@ if env.msvc:
env.Append(CCFLAGS=["/Od"]) env.Append(CCFLAGS=["/Od"])
else: else:
if env["debug_symbols"]: if env["debug_symbols"]:
# Adding dwarf-4 explicitly makes stacktraces work with clang builds, if env["platform"] == "windows":
# otherwise addr2line doesn't understand them env.Append(CCFLAGS=["-gdwarf-5"])
env.Append(CCFLAGS=["-gdwarf-4"]) else:
# Adding dwarf-4 explicitly makes stacktraces work with clang builds,
# otherwise addr2line doesn't understand them
env.Append(CCFLAGS=["-gdwarf-4"])
if methods.using_emcc(env): if methods.using_emcc(env):
# Emscripten only produces dwarf symbols when using "-g3". # Emscripten only produces dwarf symbols when using "-g3".
env.Append(CCFLAGS=["-g3"]) env.Append(CCFLAGS=["-g3"])

3
platform/windows/crash_handler_windows_signal.cpp
View File

@@ -164,6 +164,9 @@ extern void CrashHandlerException(int signal) {
int64_t image_file_base = get_image_base(_execpath); int64_t image_file_base = get_image_base(_execpath);
data.offset = image_mem_base - image_file_base; data.offset = image_mem_base - image_file_base;
if (FileAccess::exists(_execpath + ".debugsymbols")) {
_execpath = _execpath + ".debugsymbols";
}
data.state = backtrace_create_state(_execpath.utf8().get_data(), 0, &error_callback, reinterpret_cast<void *>(&data)); data.state = backtrace_create_state(_execpath.utf8().get_data(), 0, &error_callback, reinterpret_cast<void *>(&data));
if (data.state != nullptr) { if (data.state != nullptr) {
data.index = 1; data.index = 1;