From 6f24fe6971e31837abecb3367967ddc8d8c103dd Mon Sep 17 00:00:00 2001 From: Michael Pavone Date: Sat, 18 Apr 2020 23:07:44 -0700 Subject: Allow specifying a default font path at build time --- Makefile | 4 ++++ nuklear_ui/font.c | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/Makefile b/Makefile index 8be670c..5a26137 100644 --- a/Makefile +++ b/Makefile @@ -255,6 +255,10 @@ ifdef DATA_PATH CFLAGS+= -DDATA_PATH='"'$(DATA_PATH)'"' endif +ifdef FONT_PATH +CFLAGS+= -DFONT_PATH='"'$(FONT_PATH)'"' +endif + ALL=dis$(EXE) zdis$(EXE) stateview$(EXE) vgmplay$(EXE) blastem$(EXE) ifneq ($(OS),Windows) ALL+= termhelper diff --git a/nuklear_ui/font.c b/nuklear_ui/font.c index ff86847..8dde3d0 100644 --- a/nuklear_ui/font.c +++ b/nuklear_ui/font.c @@ -1,11 +1,19 @@ #include #include #include +#include #include "../util.h" #include "sfnt.h" char *default_font_path(void) { +#ifdef FONT_PATH + FILE *f = fopen(FONT_PATH, "rb"); + if (f) { + fclose(f); + return strdup(FONT_PATH); + } +#endif FILE *fc_pipe = popen("fc-match -f '%{file}'", "r"); if (!fc_pipe) { return NULL; -- cgit v1.2.3