Make the make more linux friendly.
This commit is contained in:
parent
eb709930f5
commit
57e8774fad
2 changed files with 7 additions and 6 deletions
11
Makefile
11
Makefile
|
@ -28,20 +28,23 @@ run: build test
|
||||||
powershell "cp ./builddir/zedcaster.exe ."
|
powershell "cp ./builddir/zedcaster.exe ."
|
||||||
./zedcaster
|
./zedcaster
|
||||||
|
|
||||||
|
run_not_window:
|
||||||
|
./builddir/zedcaster
|
||||||
|
|
||||||
debug: build
|
debug: build
|
||||||
gdb --nx -x .gdbinit --ex run --args builddir/zedcaster.exe
|
gdb --nx -x .gdbinit --ex run --args builddir/zedcaster
|
||||||
|
|
||||||
debug_run: build
|
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
|
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:
|
clean:
|
||||||
meson compile --clean -C builddir
|
meson compile --clean -C builddir
|
||||||
|
|
||||||
debug_test: build
|
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:
|
win_installer:
|
||||||
powershell 'start "C:\Program Files (x86)\solicus\InstallForge\bin\ifbuilderenvx86.exe" win_installer.ifp'
|
powershell 'start "C:\Program Files (x86)\solicus\InstallForge\bin\ifbuilderenvx86.exe" win_installer.ifp'
|
||||||
|
|
|
@ -27,7 +27,6 @@ namespace gui {
|
||||||
guecs::make_action(*$level.world, event, {action}));
|
guecs::make_action(*$level.world, event, {action}));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
inline std::string temp_pick_icon_for_element(combat::RitualAction& ritual) {
|
inline std::string temp_pick_icon_for_element(combat::RitualAction& ritual) {
|
||||||
using enum combat::RitualElement;
|
using enum combat::RitualElement;
|
||||||
|
|
||||||
|
@ -43,7 +42,6 @@ namespace gui {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void CombatUI::init() {
|
void CombatUI::init() {
|
||||||
$gui.world().set_the<Background>({$gui.$parser, ColorValue::DARK_MID});
|
$gui.world().set_the<Background>({$gui.$parser, ColorValue::DARK_MID});
|
||||||
auto& the_belt = $level.world->get<combat::RitualBelt>($level.player);
|
auto& the_belt = $level.world->get<combat::RitualBelt>($level.player);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue