:: commit 3b199d382ab4f27e8b07f05eb2ac894265d9181c

mintsuki <mintsuki@protonmail.com> — 2023-06-10 17:23

parents: 5538fef5ea

misc: Updates for new flanterm

diff --git a/common/GNUmakefile b/common/GNUmakefile
index 7d1aad30..70a81fce 100644
--- a/common/GNUmakefile
+++ b/common/GNUmakefile
@@ -68,6 +68,8 @@ override CPPFLAGS_FOR_TARGET := \
     -MMD \
     -MP
 
+$(call MKESCAPE,$(BUILDDIR))/./flanterm/backends/fb.o: override CPPFLAGS_FOR_TARGET += -DFLANTERM_FB_DISABLE_BUMP_ALLOC
+
 ifeq ($(TARGET),bios)
     override CFLAGS_FOR_TARGET += \
         -fno-PIE \
diff --git a/common/lib/gterm.c b/common/lib/gterm.c
index 82b5b229..2078fd99 100644
--- a/common/lib/gterm.c
+++ b/common/lib/gterm.c
@@ -783,6 +783,7 @@ no_load_font:;
         generate_canvas(fb);
 
         terms[terms_i] = flanterm_fb_init(ext_mem_alloc,
+                            pmm_free,
                             (void *)(uintptr_t)fb->framebuffer_addr,
                             fb->framebuffer_width, fb->framebuffer_height, fb->framebuffer_pitch,
                             bg_canvas,
tab: 248 wrap: offon