Fix building on older lks, and simplify it

Android-Boot-Manager · Oct 1, 2023 · 4094302 · 4094302
1 parent 7ba028d
commit 4094302
Show file tree

Hide file tree

Showing 9 changed files with 1 addition and 158 deletions.
diff --git a/lvgl.mk b/lvgl.mk
@@ -1,13 +1,5 @@
 ifdef OBJS
-include $(LVGL_DIR)/$(LVGL_DIR_NAME)/demos/lv_demos.mk
-include $(LVGL_DIR)/$(LVGL_DIR_NAME)/examples/lv_examples.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/extra/lv_extra.mk
-include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/font/lv_font.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
+OBJS += $(shell find  $(LVGL_DIR)/$(LVGL_DIR_NAME)/src -name \*.c | sed 's/\.c/\.o/g')
 else
 MODULE_SRCS += $(shell find $(LVGL_PATH)/src -type f -name '*.c')
 MODULE_SRCS += $(shell find $(LVGL_PATH)/demos -type f -name '*.c')

diff --git a/src/core/lv_core.mk b/src/core/lv_core.mk
diff --git a/src/draw/lv_draw.mk b/src/draw/lv_draw.mk
diff --git a/src/draw/sw/lv_draw_sw.mk b/src/draw/sw/lv_draw_sw.mk
diff --git a/src/extra/lv_extra.mk b/src/extra/lv_extra.mk
diff --git a/src/font/lv_font.mk b/src/font/lv_font.mk
diff --git a/src/hal/lv_hal.mk b/src/hal/lv_hal.mk
diff --git a/src/misc/lv_misc.mk b/src/misc/lv_misc.mk
diff --git a/src/widgets/lv_widgets.mk b/src/widgets/lv_widgets.mk