From 828744f11d33b08f624d173ec45d84b939c76f98 Mon Sep 17 00:00:00 2001 From: _VIFEXTech <1290176185@qq.com> Date: Mon, 10 Jan 2022 18:17:03 +0800 Subject: [PATCH] fix(Makefile): compilation errors (#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 Co-authored-by: pengyiqiang --- demos/lv_demos.mk | 2 +- lvgl.mk | 2 +- src/draw/lv_draw.mk | 2 +- src/draw/sw/lv_draw_sw.mk | 1 - 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/demos/lv_demos.mk b/demos/lv_demos.mk index ea7b8aa0d..ba5763d76 100644 --- a/demos/lv_demos.mk +++ b/demos/lv_demos.mk @@ -1 +1 @@ -CSRCS += $(shell find -L $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/demos -name "*.c") +CSRCS += $(shell find -L $(LVGL_DIR)/$(LVGL_DIR_NAME)/demos -name "*.c") diff --git a/lvgl.mk b/lvgl.mk index 2918370c5..a57c1d2bb 100644 --- a/lvgl.mk +++ b/lvgl.mk @@ -1,10 +1,10 @@ +include $(LVGL_DIR)/$(LVGL_DIR_NAME)/demos/lv_demos.mk include $(LVGL_DIR)/$(LVGL_DIR_NAME)/examples/examples.mk include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/extra/extra.mk include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/core/lv_core.mk include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/lv_draw.mk include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/sw/lv_draw_sw.mk include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/font/lv_font.mk -include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/gpu/lv_gpu.mk include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/hal/lv_hal.mk include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/misc/lv_misc.mk include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/widgets/lv_widgets.mk diff --git a/src/draw/lv_draw.mk b/src/draw/lv_draw.mk index f7934668f..803e06494 100644 --- a/src/draw/lv_draw.mk +++ b/src/draw/lv_draw.mk @@ -1,9 +1,9 @@ CSRCS += lv_draw_arc.c CSRCS += lv_draw.c -CSRCS += lv_draw_blend.c CSRCS += lv_draw_img.c CSRCS += lv_draw_label.c CSRCS += lv_draw_line.c +CSRCS += lv_draw_mask.c CSRCS += lv_draw_rect.c CSRCS += lv_draw_triangle.c CSRCS += lv_img_buf.c diff --git a/src/draw/sw/lv_draw_sw.mk b/src/draw/sw/lv_draw_sw.mk index a9823c254..07075b3a6 100644 --- a/src/draw/sw/lv_draw_sw.mk +++ b/src/draw/sw/lv_draw_sw.mk @@ -6,7 +6,6 @@ CSRCS += lv_draw_sw_letter.c CSRCS += lv_draw_sw_line.c CSRCS += lv_draw_sw_rect.c CSRCS += lv_draw_sw_polygon.c -CSRCS += lv_draw_sw_mask.c DEPPATH += --dep-path $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/sw VPATH += :$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/sw