games/roguish
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix for OSX build.

Browse source
This commit is contained in:
Zed A. Shaw 2024-12-08 13:18:09 -05:00
parent c483649e20
commit 3de70f71f3
3 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
scripts/coverage_reset.sh Executable file
View file

@ -0,0 +1,11 @@
#!/usr/bin/env bash
set -e
mv -f ./subprojects/packagecache .
rm -rf subprojects builddir
mkdir subprojects
mv packagecache ./subprojects/
mkdir builddir
cp wraps/*.wrap subprojects/
# on OSX you can't do this with static
meson setup -Db_coverage=true builddir

2
scripts/reset_build.sh
View file

@ -8,4 +8,4 @@ mv packagecache ./subprojects/
mkdir builddir mkdir builddir
cp wraps/*.wrap subprojects/ cp wraps/*.wrap subprojects/
# on OSX you can't do this with static # on OSX you can't do this with static
meson setup -Db_coverage=true builddir meson setup builddir

5
tools/designer.cpp
View file

@ -13,6 +13,7 @@
#include <locale> #include <locale>
#include <codecvt> #include <codecvt>
#include <vector> #include <vector>
#include <algorithm>
using namespace fmt; using namespace fmt;
using namespace ftxui; using namespace ftxui;
@ -208,12 +209,12 @@ class GUI {
return true; return true;
} else if(event.type == sf::Event::KeyPressed) { } else if(event.type == sf::Event::KeyPressed) {
if(KB::isKeyPressed(KB::Up)) { if(KB::isKeyPressed(KB::Up)) {
$start_char = std::max(WCHAR_MIN+1, $start_char - $font_grid.page_size()); $start_char = std::max(wchar_t(WCHAR_MIN+1), wchar_t($start_char - $font_grid.page_size()));
$font_grid.render($start_char, false); $font_grid.render($start_char, false);
event_happened = true; event_happened = true;
$renderer.clear_cache(); $renderer.clear_cache();
} else if(KB::isKeyPressed(KB::Down)) { } else if(KB::isKeyPressed(KB::Down)) {
$start_char = std::min(WCHAR_MAX, $start_char + $font_grid.page_size()); $start_char = std::min(wchar_t(WCHAR_MAX), wchar_t($start_char + $font_grid.page_size()));
$font_grid.render($start_char, false); $font_grid.render($start_char, false);
$renderer.clear_cache(); $renderer.clear_cache();
} else if(KB::isKeyPressed(KB::Equal)) { } else if(KB::isKeyPressed(KB::Equal)) {