From dd5d326f2c76865e0e530383103738e11c492658 Mon Sep 17 00:00:00 2001
From: UncleRus <unclerus@gmail.com>
Date: Sun, 11 Dec 2016 19:10:26 +0500
Subject: [PATCH] Makefile fix

---
 extras/fonts/component.mk | 19 +++++++++++++------
 extras/fonts/fonts.c      |  2 +-
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/extras/fonts/component.mk b/extras/fonts/component.mk
index 87d988e..9b1776c 100644
--- a/extras/fonts/component.mk
+++ b/extras/fonts/component.mk
@@ -1,19 +1,26 @@
 # Component makefile for extras/fonts
 
-# expected anyone using bmp driver includes it as 'fonts/fonts.h'
+# expected anyone using this component includes it as 'fonts/fonts.h'
 INC_DIRS += $(fonts_ROOT)..
 
 # args for passing into compile rule generation
-fonts_SRC_DIR =  $(fonts_ROOT)
+fonts_SRC_DIR = $(fonts_ROOT)
 
 FONTS_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
 
-# fonts by default
+# default builtin fonts
 include $(FONTS_DIR)defaults.mk
 
 fonts_CFLAGS = $(CFLAGS) \
-	-DFONTS_GLCD_5X7=$(FONTS_GLCD_5X7)
-	-DFONTS_ROBOTO_8PT=$(FONTS_ROBOTO_8PT)
-	-DFONTS_ROBOTO_10PT=$(FONTS_ROBOTO_10PT)
+	-DFONTS_GLCD_5X7=$(FONTS_GLCD_5X7) \
+	-DFONTS_ROBOTO_8PT=$(FONTS_ROBOTO_8PT) \
+	-DFONTS_ROBOTO_10PT=$(FONTS_ROBOTO_10PT) \
+	-DFONTS_TERMINUS_6X12_KOI8_R=$(FONTS_TERMINUS_6X12_KOI8_R) \
+	-DFONTS_TERMINUS_8X14_KOI8_R=$(FONTS_TERMINUS_8X14_KOI8_R) \
+	-DFONTS_TERMINUS_BOLD_8X14_KOI8_R=$(FONTS_TERMINUS_BOLD_8X14_KOI8_R) \
+	-DFONTS_TERMINUS_14X28_KOI8_R=$(FONTS_TERMINUS_14X28_KOI8_R) \
+	-DFONTS_TERMINUS_BOLD_14X28_KOI8_R=$(FONTS_TERMINUS_BOLD_14X28_KOI8_R) \
+	-DFONTS_TERMINUS_16X32_KOI8_R=$(FONTS_TERMINUS_16X32_KOI8_R) \
+	-DFONTS_TERMINUS_BOLD_16X32_KOI8_R=$(FONTS_TERMINUS_BOLD_16X32_KOI8_R)
 	
 $(eval $(call component_compile_rules,fonts))
diff --git a/extras/fonts/fonts.c b/extras/fonts/fonts.c
index 67ef1e7..2b22bb7 100644
--- a/extras/fonts/fonts.c
+++ b/extras/fonts/fonts.c
@@ -118,7 +118,7 @@ uint16_t font_measure_string(const font_info_t *fnt, const char *s)
     uint16_t res = 0;
     while (s)
     {
-        font_char_desc_t *d = font_get_char_desc(fnt, *s);
+        const font_char_desc_t *d = font_get_char_desc(fnt, *s);
         if (d)
             res += d->width + fnt->c;
         s++;