From 8a00ae83c71a3e9da73dae8a62a9cbec375bcd7a Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 23 Jan 2018 20:57:29 +0100 Subject: [PATCH] tuxtxt: disable unused defines for alternative fonts Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/4f6ba148753c9b184adb99526d6495ac127cd82e Author: vanhofen Date: 2018-01-23 (Tue, 23 Jan 2018) Origin message was: ------------------ - tuxtxt: disable unused defines for alternative fonts --- lib/libtuxtxt/tuxtxt.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/libtuxtxt/tuxtxt.h b/lib/libtuxtxt/tuxtxt.h index 0a544b7ac..7fa4a5fc3 100644 --- a/lib/libtuxtxt/tuxtxt.h +++ b/lib/libtuxtxt/tuxtxt.h @@ -76,9 +76,11 @@ extern int tuxtxt_get_zipsize(int p, int sp); /* fonts */ #define TUXTXTTTF FONTDIR "/tuxtxt.ttf" #define TUXTXTOTB FONTDIR "/tuxtxt.otb" +#if 0 /* alternative fontdir */ -#define TUXTXTTTFVAR "/var/tuxtxt/tuxtxt.ttf" -#define TUXTXTOTBVAR "/var/tuxtxt/tuxtxt.otb" +#define TUXTXTTTFVAR FONTDIR_VAR "/tuxtxt.ttf" +#define TUXTXTOTBVAR FONTDIR_VAR "/tuxtxt.otb" +#endif int TTFWidthFactor16, TTFHeightFactor16, TTFShiftX, TTFShiftY; /* parameters for adapting to various TTF fonts */ int fontheight, fontwidth, fontwidth_normal, fontwidth_small, fontwidth_topmenumain, fontwidth_topmenusmall, ascender;