From 57e8774fad571817281fa29a9fbc8c68add321a5 Mon Sep 17 00:00:00 2001 From: "Zed A. Shaw" Date: Fri, 25 Apr 2025 00:17:24 -0400 Subject: [PATCH] Make the make more linux friendly. --- Makefile | 11 +++++++---- combat_ui.cpp | 2 -- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 562ac6d..444066a 100644 --- a/Makefile +++ b/Makefile @@ -28,20 +28,23 @@ run: build test powershell "cp ./builddir/zedcaster.exe ." ./zedcaster +run_not_window: + ./builddir/zedcaster + debug: build - gdb --nx -x .gdbinit --ex run --args builddir/zedcaster.exe + gdb --nx -x .gdbinit --ex run --args builddir/zedcaster debug_run: build - gdb --nx -x .gdbinit --batch --ex run --ex bt --ex q --args builddir/zedcaster.exe + gdb --nx -x .gdbinit --batch --ex run --ex bt --ex q --args builddir/zedcaster debug_walk: build test - gdb --nx -x .gdbinit --batch --ex run --ex bt --ex q --args builddir/zedcaster.exe t + gdb --nx -x .gdbinit --batch --ex run --ex bt --ex q --args builddir/zedcaster t clean: meson compile --clean -C builddir debug_test: build - gdb --nx -x .gdbinit --ex run --args builddir/runtests.exe -e + gdb --nx -x .gdbinit --ex run --args builddir/runtests -e win_installer: powershell 'start "C:\Program Files (x86)\solicus\InstallForge\bin\ifbuilderenvx86.exe" win_installer.ifp' diff --git a/combat_ui.cpp b/combat_ui.cpp index e881240..bea25a8 100644 --- a/combat_ui.cpp +++ b/combat_ui.cpp @@ -27,7 +27,6 @@ namespace gui { guecs::make_action(*$level.world, event, {action})); } - inline std::string temp_pick_icon_for_element(combat::RitualAction& ritual) { using enum combat::RitualElement; @@ -43,7 +42,6 @@ namespace gui { } } - void CombatUI::init() { $gui.world().set_the({$gui.$parser, ColorValue::DARK_MID}); auto& the_belt = $level.world->get($level.player);