From 3d419a3330e910de50bfe014fc7b639830640010 Mon Sep 17 00:00:00 2001 From: Simon Forman Date: Sun, 26 Feb 2023 10:06:39 -0800 Subject: [PATCH] This compiles. --- implementations/uvm-ncc/GNUmakefile | 5 ++++- implementations/uvm-ncc/font/convert.py | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/implementations/uvm-ncc/GNUmakefile b/implementations/uvm-ncc/GNUmakefile index 06b9247..aa43115 100644 --- a/implementations/uvm-ncc/GNUmakefile +++ b/implementations/uvm-ncc/GNUmakefile @@ -7,8 +7,11 @@ UVM_VM=$(UVM)/vm run: $(UVM_NCC)/out.asm cd $(UVM_VM) ; cargo run $(UVM_NCC)/out.asm -$(UVM_NCC)/out.asm: $(UVM_JOY)/xerblin.c +$(UVM_NCC)/out.asm: $(UVM_JOY)/xerblin.c $(UVM_JOY)/font/font.h cd $(UVM_NCC) ; cargo run $(UVM_JOY)/xerblin.c +$(UVM_JOY)/font/font.h: + gmake -C $(UVM_JOY)/font + clean: $(RM) $(UVM_NCC)/out.asm diff --git a/implementations/uvm-ncc/font/convert.py b/implementations/uvm-ncc/font/convert.py index cedf60c..e89a0cd 100644 --- a/implementations/uvm-ncc/font/convert.py +++ b/implementations/uvm-ncc/font/convert.py @@ -24,7 +24,7 @@ int font_height = {h}; u32 font_data[{len(txt)}][{w * h}]; void -init_font_data(void) +init_font_data() {{ \tmemset(font_data, 0, {4 * len(txt) * w * h}); ''')