From 772e403eb0e3f94bc56f3cf666992e2528239461 Mon Sep 17 00:00:00 2001 From: Xiang Xiao Date: Mon, 1 Mar 2021 07:00:35 -0800 Subject: [PATCH] fix(lv_*.mk): add the miss source code (#2106) and reorder the entry to help finding the mismatch --- lvgl.mk | 16 ++++++++-------- src/lv_core/lv_core.mk | 2 +- src/lv_draw/lv_draw.mk | 12 ++++++------ src/lv_gpu/lv_gpu.mk | 3 +++ src/lv_misc/lv_misc.mk | 24 ++++++++++++------------ src/lv_widgets/lv_widgets.mk | 22 +++++++++++----------- 6 files changed, 41 insertions(+), 38 deletions(-) diff --git a/lvgl.mk b/lvgl.mk index d9925e213..766ca3af1 100644 --- a/lvgl.mk +++ b/lvgl.mk @@ -1,9 +1,9 @@ -include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_core/lv_core.mk -include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_hal/lv_hal.mk -include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_widgets/lv_widgets.mk -include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_font/lv_font.mk -include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_misc/lv_misc.mk -include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_draw/lv_draw.mk -include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_gpu/lv_gpu.mk -include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/extra/extra.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/lv_core/lv_core.mk +include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_draw/lv_draw.mk +include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_font/lv_font.mk +include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_gpu/lv_gpu.mk +include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_hal/lv_hal.mk +include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_misc/lv_misc.mk +include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_widgets/lv_widgets.mk diff --git a/src/lv_core/lv_core.mk b/src/lv_core/lv_core.mk index ca87c12c2..1116c1463 100644 --- a/src/lv_core/lv_core.mk +++ b/src/lv_core/lv_core.mk @@ -4,8 +4,8 @@ CSRCS += lv_indev.c CSRCS += lv_indev_scroll.c CSRCS += lv_obj.c CSRCS += lv_obj_class.c -CSRCS += lv_obj_pos.c CSRCS += lv_obj_draw.c +CSRCS += lv_obj_pos.c CSRCS += lv_obj_scroll.c CSRCS += lv_obj_style.c CSRCS += lv_obj_tree.c diff --git a/src/lv_draw/lv_draw.mk b/src/lv_draw/lv_draw.mk index 0022f48b3..ad2f8ef39 100644 --- a/src/lv_draw/lv_draw.mk +++ b/src/lv_draw/lv_draw.mk @@ -1,14 +1,14 @@ -CSRCS += lv_draw_mask.c +CSRCS += lv_draw_arc.c CSRCS += lv_draw_blend.c -CSRCS += lv_draw_rect.c +CSRCS += lv_draw_img.c CSRCS += lv_draw_label.c CSRCS += lv_draw_line.c -CSRCS += lv_draw_img.c -CSRCS += lv_draw_arc.c +CSRCS += lv_draw_mask.c +CSRCS += lv_draw_rect.c CSRCS += lv_draw_triangle.c -CSRCS += lv_img_decoder.c -CSRCS += lv_img_cache.c CSRCS += lv_img_buf.c +CSRCS += lv_img_cache.c +CSRCS += lv_img_decoder.c DEPPATH += --dep-path $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_draw VPATH += :$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_draw diff --git a/src/lv_gpu/lv_gpu.mk b/src/lv_gpu/lv_gpu.mk index cff89c686..c647d558d 100644 --- a/src/lv_gpu/lv_gpu.mk +++ b/src/lv_gpu/lv_gpu.mk @@ -1,3 +1,6 @@ +CSRCS += lv_gpu_nxp_pxp.c +CSRCS += lv_gpu_nxp_pxp_osa.c +CSRCS += lv_gpu_nxp_vglite.c CSRCS += lv_gpu_stm32_dma2d.c DEPPATH += --dep-path $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_gpu diff --git a/src/lv_misc/lv_misc.mk b/src/lv_misc/lv_misc.mk index 3a79fb83d..ebaf6496e 100644 --- a/src/lv_misc/lv_misc.mk +++ b/src/lv_misc/lv_misc.mk @@ -1,20 +1,20 @@ -CSRCS += lv_area.c -CSRCS += lv_timer.c -CSRCS += lv_fs.c CSRCS += lv_anim.c -CSRCS += lv_mem.c -CSRCS += lv_ll.c +CSRCS += lv_area.c +CSRCS += lv_async.c +CSRCS += lv_bidi.c CSRCS += lv_color.c +CSRCS += lv_fs.c +CSRCS += lv_gc.c +CSRCS += lv_ll.c +CSRCS += lv_log.c +CSRCS += lv_math.c +CSRCS += lv_mem.c +CSRCS += lv_printf.c +CSRCS += lv_style.c +CSRCS += lv_timer.c CSRCS += lv_txt.c CSRCS += lv_txt_ap.c -CSRCS += lv_math.c -CSRCS += lv_log.c -CSRCS += lv_gc.c CSRCS += lv_utils.c -CSRCS += lv_async.c -CSRCS += lv_printf.c -CSRCS += lv_bidi.c -CSRCS += lv_style.c DEPPATH += --dep-path $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_misc VPATH += :$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_misc diff --git a/src/lv_widgets/lv_widgets.mk b/src/lv_widgets/lv_widgets.mk index 643f1b79e..00b2727e1 100644 --- a/src/lv_widgets/lv_widgets.mk +++ b/src/lv_widgets/lv_widgets.mk @@ -1,20 +1,20 @@ CSRCS += lv_arc.c CSRCS += lv_bar.c +CSRCS += lv_btn.c +CSRCS += lv_btnmatrix.c +CSRCS += lv_canvas.c +CSRCS += lv_chart.c CSRCS += lv_checkbox.c CSRCS += lv_dropdown.c -CSRCS += lv_line.c -CSRCS += lv_roller.c -CSRCS += lv_table.c -CSRCS += lv_btn.c -CSRCS += lv_chart.c -CSRCS += lv_canvas.c -CSRCS += lv_meter.c -CSRCS += lv_label.c -CSRCS += lv_slider.c -CSRCS += lv_textarea.c -CSRCS += lv_btnmatrix.c CSRCS += lv_img.c +CSRCS += lv_label.c +CSRCS += lv_line.c +CSRCS += lv_meter.c +CSRCS += lv_roller.c +CSRCS += lv_slider.c CSRCS += lv_switch.c +CSRCS += lv_table.c +CSRCS += lv_textarea.c DEPPATH += --dep-path $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_widgets VPATH += :$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_widgets