From a44a0412eae90a8590584cd43e3677bd17d26afa Mon Sep 17 00:00:00 2001
From: Giacomo Caironi <giacomo.caironi@skywarder.eu>
Date: Thu, 31 Aug 2023 19:51:21 +0000
Subject: [PATCH] [CI] Fix cross-compilation
---
.gitlab-ci.yml | 2 +-
SkywardHub.pro | 1 +
src/shared/Core/CrashLogger.h | 2 ++
3 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6bac76ac..fab4261b 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 ba8d17d2..125b5ae4 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 9dc9103b..dcf0e327 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
--
GitLab