diff --git a/lib/lv_lib_freetype/lv_freetype.c b/lib/lv_lib_freetype/lv_freetype.c index ad4b03a2..4af20eb7 100644 --- a/lib/lv_lib_freetype/lv_freetype.c +++ b/lib/lv_lib_freetype/lv_freetype.c @@ -7,7 +7,7 @@ * INCLUDES *********************/ #include "lv_freetype.h" -#if HASP_USE_FREETYPE +#if LV_USE_FREETYPE #include "ft2build.h" #include FT_FREETYPE_H diff --git a/src/hasp/hasp_font.cpp b/src/hasp/hasp_font.cpp index 1fa919a8..631f602f 100644 --- a/src/hasp/hasp_font.cpp +++ b/src/hasp/hasp_font.cpp @@ -4,7 +4,7 @@ #if HASP_USE_FREETYPE > 0 #ifndef LV_USE_FREETYPE -#define LV_USE_FREETYPE 1 +#define LV_USE_FREETYPE #endif #include "lv_freetype.h" @@ -18,7 +18,7 @@ typedef struct uint16_t weight; /* font size */ uint16_t style; /* font style */ } lv_ft_info_t; -#endif +#endif // HASP_USE_FREETYPE #include "hasp_mem.h" #include "font/hasp_font_loader.h" @@ -218,7 +218,9 @@ static lv_font_t* font_add_to_list(const char* payload) // Convert the payload to a font pointer lv_font_t* get_font(const char* payload) { +#if HASP_USE_FREETYPE > 0 LOG_DEBUG(TAG_FONT, F("FreeType High Watermark %u"), lv_ft_freetype_high_watermark()); +#endif lv_font_t* font = font_find_in_list(payload); if(font) return font;