jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-25 20:26:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix linux build error

Browse Source
This commit is contained in:
fvanroie 2022-05-17 14:05:41 +02:00
parent fcd9d60c08
commit a1aad7c1a2
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/lv_lib_freetype/lv_freetype.c
View File

@ -7,7 +7,7 @@
* INCLUDES * INCLUDES
*********************/ *********************/
#include "lv_freetype.h" #include "lv_freetype.h"
#if HASP_USE_FREETYPE #if LV_USE_FREETYPE
#include "ft2build.h" #include "ft2build.h"
#include FT_FREETYPE_H #include FT_FREETYPE_H

6
src/hasp/hasp_font.cpp
View File

@ -4,7 +4,7 @@
#if HASP_USE_FREETYPE > 0 #if HASP_USE_FREETYPE > 0
#ifndef LV_USE_FREETYPE #ifndef LV_USE_FREETYPE
#define LV_USE_FREETYPE 1 #define LV_USE_FREETYPE
#endif #endif
#include "lv_freetype.h" #include "lv_freetype.h"
@ -18,7 +18,7 @@ typedef struct
uint16_t weight; /* font size */ uint16_t weight; /* font size */
uint16_t style; /* font style */ uint16_t style; /* font style */
} lv_ft_info_t; } lv_ft_info_t;
#endif #endif // HASP_USE_FREETYPE
#include "hasp_mem.h" #include "hasp_mem.h"
#include "font/hasp_font_loader.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 // Convert the payload to a font pointer
lv_font_t* get_font(const char* payload) 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()); LOG_DEBUG(TAG_FONT, F("FreeType High Watermark %u"), lv_ft_freetype_high_watermark());
#endif
lv_font_t* font = font_find_in_list(payload); lv_font_t* font = font_find_in_list(payload);
if(font) return font; if(font) return font;