j3d1/esp-open-rtos
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Makefile fix

Browse source
This commit is contained in:
UncleRus 2016-12-11 19:10:26 +05:00
parent 75352783bb
commit dd5d326f2c
2 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
extras/fonts/component.mk
View file

@ -1,19 +1,26 @@
# Component makefile for extras/fonts # 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).. INC_DIRS += $(fonts_ROOT)..
# args for passing into compile rule generation # args for passing into compile rule generation
fonts_SRC_DIR = $(fonts_ROOT) fonts_SRC_DIR = $(fonts_ROOT)
FONTS_DIR := $(dir $(lastword $(MAKEFILE_LIST))) FONTS_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
# fonts by default # default builtin fonts
include $(FONTS_DIR)defaults.mk include $(FONTS_DIR)defaults.mk
fonts_CFLAGS = $(CFLAGS) \ fonts_CFLAGS = $(CFLAGS) \
-DFONTS_GLCD_5X7=$(FONTS_GLCD_5X7) -DFONTS_GLCD_5X7=$(FONTS_GLCD_5X7) \
-DFONTS_ROBOTO_8PT=$(FONTS_ROBOTO_8PT) -DFONTS_ROBOTO_8PT=$(FONTS_ROBOTO_8PT) \
-DFONTS_ROBOTO_10PT=$(FONTS_ROBOTO_10PT) -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)) $(eval $(call component_compile_rules,fonts))

2
extras/fonts/fonts.c
View file

@ -118,7 +118,7 @@ uint16_t font_measure_string(const font_info_t *fnt, const char *s)
uint16_t res = 0; uint16_t res = 0;
while (s) 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) if (d)
res += d->width + fnt->c; res += d->width + fnt->c;
s++; s++;