Skip to content

Commit 828744f

Browse files
FASTSHIFTpengyiqiang
and
pengyiqiang
authored
fix(Makefile): compilation errors (lvgl#2944)
* fix(Kconfig) remove duplicate LV_BUILD_EXAMPLES configuration * feat(refr) add reset of FPS statistics * fix(conf) mismatched macro judgment * fix(Makefile) compilation errors Signed-off-by: pengyiqiang <[email protected]> Co-authored-by: pengyiqiang <[email protected]>
1 parent 305284c commit 828744f

File tree

4 files changed

+3
-4
lines changed

4 files changed

+3
-4
lines changed

demos/lv_demos.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
CSRCS += $(shell find -L $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/demos -name "*.c")
1+
CSRCS += $(shell find -L $(LVGL_DIR)/$(LVGL_DIR_NAME)/demos -name "*.c")

lvgl.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1+
include $(LVGL_DIR)/$(LVGL_DIR_NAME)/demos/lv_demos.mk
12
include $(LVGL_DIR)/$(LVGL_DIR_NAME)/examples/examples.mk
23
include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/extra/extra.mk
34
include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/core/lv_core.mk
45
include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/lv_draw.mk
56
include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/sw/lv_draw_sw.mk
67
include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/font/lv_font.mk
7-
include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/gpu/lv_gpu.mk
88
include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/hal/lv_hal.mk
99
include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/misc/lv_misc.mk
1010
include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/widgets/lv_widgets.mk

src/draw/lv_draw.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
CSRCS += lv_draw_arc.c
22
CSRCS += lv_draw.c
3-
CSRCS += lv_draw_blend.c
43
CSRCS += lv_draw_img.c
54
CSRCS += lv_draw_label.c
65
CSRCS += lv_draw_line.c
6+
CSRCS += lv_draw_mask.c
77
CSRCS += lv_draw_rect.c
88
CSRCS += lv_draw_triangle.c
99
CSRCS += lv_img_buf.c

src/draw/sw/lv_draw_sw.mk

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ CSRCS += lv_draw_sw_letter.c
66
CSRCS += lv_draw_sw_line.c
77
CSRCS += lv_draw_sw_rect.c
88
CSRCS += lv_draw_sw_polygon.c
9-
CSRCS += lv_draw_sw_mask.c
109

1110
DEPPATH += --dep-path $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/sw
1211
VPATH += :$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/sw

0 commit comments

Comments
 (0)