Skip to content

Commit 2f606df

Browse files
authored
Merge pull request #187 from lbuque/compile/lvgl_font
Fix compilation errors when using it with lvgl.
2 parents 27483fc + 2ae7758 commit 2f606df

16 files changed

Lines changed: 2459 additions & 2204 deletions

CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@ set(COMPONENT_ADD_INCLUDEDIRS
33
)
44
file(GLOB SRCS
55
src/*.cpp
6-
src/lgfx/Fonts/lv_font_*.c
6+
src/lgfx/Fonts/lvgl/lv_font_*.c
77
src/lgfx/Fonts/efont/*.c
88
src/lgfx/Fonts/IPA/*.c
99
src/lgfx/utility/*.c
1010
src/lgfx/v1/*.cpp
11+
src/lgfx/v1/lv_font/*.c
1112
src/lgfx/v1/misc/*.cpp
1213
src/lgfx/v1/panel/*.cpp
1314
src/lgfx/v1/platforms/esp32/*.cpp

examples/Basic/LvglFont/LvglFont.ino

Lines changed: 230 additions & 123 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)