diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6bac76ac36e5d3e6ec83adb657ae2ffeee7fa525..fab4261bead5e44b8d1cfa63a795ee45c072700a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -72,7 +72,7 @@ build_windows: - export PATH=/home/gitlab-runner/mxe/usr/bin:$PATH script: - ./sbs --clean - - x86_64-w64-mingw32.static-qmake-qt5 LIBS+=-lmsvcr90 CONFIG+=release CONFIG+=force_debug_info + - x86_64-w64-mingw32.static-qmake-qt5 CONFIG+=release CONFIG+=force_debug_info - make - mv release/SkywardHub.exe Ground_Station-$CI_COMMIT_SHORT_SHA.exe artifacts: diff --git a/SkywardHub.pro b/SkywardHub.pro index ba8d17d250db489ab7a22b771b5bb0af64ef8008..125b5ae450b564595dcb916147c091e59ac198c3 100644 --- a/SkywardHub.pro +++ b/SkywardHub.pro @@ -145,5 +145,6 @@ RESOURCES += \ src/entrypoints/groundstation/application.qrc win32: LIBS += -ldbghelp -lpsapi + unix: LIBS += -ldw -lunwind unix: QMAKE_CXXFLAGS += -DBACKWARD_HAS_DW=1 -DBACKWARD_HAS_LIBUNWIND=1 diff --git a/src/shared/Core/CrashLogger.h b/src/shared/Core/CrashLogger.h index 9dc9103bd277a106555264dba0ab09b3b9a21a5e..dcf0e32725b75bc513b4e5968a9a6257d844a546 100644 --- a/src/shared/Core/CrashLogger.h +++ b/src/shared/Core/CrashLogger.h @@ -219,7 +219,9 @@ public: SetUnhandledExceptionFilter(crash_handler); signal(SIGABRT, signal_handler); +#ifndef __MINGW32__ _set_abort_behavior(0, _WRITE_ABORT_MSG | _CALL_REPORTFAULT); +#endif std::set_terminate(&terminator); #ifndef BACKWARD_ATLEAST_CXX17