From 680d716155ec2774f0745205be44035fa8aefb9c Mon Sep 17 00:00:00 2001 From: Stepland <16676308+Stepland@users.noreply.github.com> Date: Sun, 17 May 2020 12:21:57 +0200 Subject: [PATCH] Add libdw with backward-cpp for amazing stacktraces --- meson.build | 11 ++++++++--- src/Input/KeyMapping.hpp | 1 - src/Screens/MusicSelect/Options/InputRemap.cpp | 1 - 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/meson.build b/meson.build index 4c38501..cf78d01 100644 --- a/meson.build +++ b/meson.build @@ -6,6 +6,7 @@ project( ) sources = [ + 'include/backward-cpp/backward.cpp', 'include/imgui/imgui.cpp', 'include/imgui/imgui_draw.cpp', 'include/imgui/imgui_widgets.cpp', @@ -112,12 +113,16 @@ foreach module : ['system', 'window', 'graphics', 'audio'] endforeach dependencies += dependency('threads') -dependencies += cc.find_library('m', required : false) dependencies += dependency('gl') dependencies += cc.find_library('atomic') -dependencies += cc.find_library('X11') -add_project_link_arguments(['-lstdc++'], language : 'cpp') +if host_machine.system() == 'linux' + dependencies += cc.find_library('m') + dependencies += cc.find_library('X11') + dependencies += cc.find_library('dw') + add_project_arguments('-DBACKWARD_HAS_DW=1', language : 'cpp') + add_project_link_arguments('-lstdc++', language : 'cpp') +endif inc = include_directories('include', 'include/imgui', 'include/imgui-sfml') diff --git a/src/Input/KeyMapping.hpp b/src/Input/KeyMapping.hpp index cc54f01..1705adf 100644 --- a/src/Input/KeyMapping.hpp +++ b/src/Input/KeyMapping.hpp @@ -5,7 +5,6 @@ #include #include -#include #include #include "Buttons.hpp" diff --git a/src/Screens/MusicSelect/Options/InputRemap.cpp b/src/Screens/MusicSelect/Options/InputRemap.cpp index 2a89e7c..9a8fdeb 100644 --- a/src/Screens/MusicSelect/Options/InputRemap.cpp +++ b/src/Screens/MusicSelect/Options/InputRemap.cpp @@ -2,7 +2,6 @@ #include -#include #include #include "../../../Toolkit/HSL.hpp"