From 40943026d5df222d0c9e9914873c56eadb39d8af Mon Sep 17 00:00:00 2001
From: luka177 <lukapanio@gmail.com>
Date: Sun, 1 Oct 2023 15:13:08 +0200
Subject: [PATCH] Fix building on older lks, and simplify it

---
 lvgl.mk                   | 10 +---------
 src/core/lv_core.mk       | 21 ---------------------
 src/draw/lv_draw.mk       | 20 --------------------
 src/draw/sw/lv_draw_sw.mk | 17 -----------------
 src/extra/lv_extra.mk     |  1 -
 src/font/lv_font.mk       | 36 ------------------------------------
 src/hal/lv_hal.mk         |  8 --------
 src/misc/lv_misc.mk       | 26 --------------------------
 src/widgets/lv_widgets.mk | 20 --------------------
 9 files changed, 1 insertion(+), 158 deletions(-)
 delete mode 100644 src/core/lv_core.mk
 delete mode 100644 src/draw/lv_draw.mk
 delete mode 100644 src/draw/sw/lv_draw_sw.mk
 delete mode 100644 src/extra/lv_extra.mk
 delete mode 100644 src/font/lv_font.mk
 delete mode 100644 src/hal/lv_hal.mk
 delete mode 100644 src/misc/lv_misc.mk
 delete mode 100644 src/widgets/lv_widgets.mk

diff --git a/lvgl.mk b/lvgl.mk
index 2b40c9886b82..af1d305a3cf7 100644
--- 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
deleted file mode 100644
index 271836a7a1c2..000000000000
--- a/src/core/lv_core.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/core/lv_disp.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/core/lv_group.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/core/lv_indev.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/core/lv_indev_scroll.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/core/lv_obj.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/core/lv_obj_class.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/core/lv_obj_draw.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/core/lv_obj_pos.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/core/lv_obj_scroll.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/core/lv_obj_style.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/core/lv_obj_style_gen.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/core/lv_obj_tree.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/core/lv_event.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/core/lv_refr.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/core/lv_theme.o
-
-DEPPATH += --dep-path $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/core
-VPATH += :$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/core
-
-INCLUDES += "-I$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/core"
-
diff --git a/src/draw/lv_draw.mk b/src/draw/lv_draw.mk
deleted file mode 100644
index 70b0c87edbca..000000000000
--- a/src/draw/lv_draw.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/lv_draw_arc.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/lv_draw.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/lv_draw_img.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/lv_draw_label.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/lv_draw_line.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/lv_draw_mask.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/lv_draw_rect.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/lv_draw_transform.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/lv_draw_layer.c
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/lv_draw_triangle.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/lv_img_buf.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/lv_img_cache.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/lv_img_decoder.o
-
-DEPPATH += --dep-path $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw
-VPATH += :$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw
-
-INCLUDES += "-I$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw"
-
-include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/sdl/lv_draw_sdl.mk
diff --git a/src/draw/sw/lv_draw_sw.mk b/src/draw/sw/lv_draw_sw.mk
deleted file mode 100644
index bcde62cc6407..000000000000
--- a/src/draw/sw/lv_draw_sw.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/sw/lv_draw_sw.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/sw/lv_draw_sw_arc.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/sw/lv_draw_sw_blend.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/sw/lv_draw_sw_dither.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/sw/lv_draw_sw_gradient.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/sw/lv_draw_sw_img.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/sw/lv_draw_sw_letter.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/sw/lv_draw_sw_line.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/sw/lv_draw_sw_polygon.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/sw/lv_draw_sw_rect.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/sw/lv_draw_sw_transform.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/sw/lv_draw_sw_layer.o
-
-DEPPATH += --dep-path $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/sw
-VPATH += :$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/sw
-
-INCLUDES += "-I$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/sw"
diff --git a/src/extra/lv_extra.mk b/src/extra/lv_extra.mk
deleted file mode 100644
index 1afcc7b7f3f1..000000000000
--- a/src/extra/lv_extra.mk
+++ /dev/null
@@ -1 +0,0 @@
-CSRCS += $(shell find -L $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/extra -name \*.c)
diff --git a/src/font/lv_font.mk b/src/font/lv_font.mk
deleted file mode 100644
index f32bd6151e0a..000000000000
--- a/src/font/lv_font.mk
+++ /dev/null
@@ -1,36 +0,0 @@
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/font/lv_font.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/font/lv_font_fmt_txt.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/font/lv_font_loader.o
-
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/font/lv_font_dejavu_16_persian_hebrew.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/font/lv_font_montserrat_8.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/font/lv_font_montserrat_10.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/font/lv_font_montserrat_12.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/font/lv_font_montserrat_12_subpx.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/font/lv_font_montserrat_14.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/font/lv_font_montserrat_16.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/font/lv_font_montserrat_18.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/font/lv_font_montserrat_20.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/font/lv_font_montserrat_22.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/font/lv_font_montserrat_24.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/font/lv_font_montserrat_26.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/font/lv_font_montserrat_28.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/font/lv_font_montserrat_28_compressed.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/font/lv_font_montserrat_30.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/font/lv_font_montserrat_32.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/font/lv_font_montserrat_34.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/font/lv_font_montserrat_36.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/font/lv_font_montserrat_38.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/font/lv_font_montserrat_40.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/font/lv_font_montserrat_42.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/font/lv_font_montserrat_44.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/font/lv_font_montserrat_46.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/font/lv_font_montserrat_48.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/font/lv_font_simsun_16_cjk.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/font/lv_font_unscii_8.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/font/lv_font_unscii_16.o
-
-DEPPATH += --dep-path $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/font
-VPATH += :$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/font
-
-INCLUDES += "-I$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/font"
diff --git a/src/hal/lv_hal.mk b/src/hal/lv_hal.mk
deleted file mode 100644
index 3e2976275a76..000000000000
--- a/src/hal/lv_hal.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/hal/lv_hal_disp.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/hal/lv_hal_indev.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/hal/lv_hal_tick.o
-
-DEPPATH += --dep-path $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/hal
-VPATH += :$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/hal
-
-INCLUDES += "-I$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/hal"
diff --git a/src/misc/lv_misc.mk b/src/misc/lv_misc.mk
deleted file mode 100644
index a2daa4ff4ee8..000000000000
--- a/src/misc/lv_misc.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/misc/lv_anim.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/misc/lv_anim_timeline.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/misc/lv_area.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/misc/lv_async.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/misc/lv_bidi.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/misc/lv_color.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/misc/lv_fs.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/misc/lv_gc.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/misc/lv_ll.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/misc/lv_log.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/misc/lv_lru.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/misc/lv_math.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/misc/lv_mem.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/misc/lv_printf.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/misc/lv_style.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/misc/lv_style_gen.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/misc/lv_timer.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/misc/lv_tlsf.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/misc/lv_txt.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/misc/lv_txt_ap.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/misc/lv_utils.o
-
-DEPPATH += --dep-path $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/misc
-VPATH += :$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/misc
-
-INCLUDES += "-I$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/misc"
diff --git a/src/widgets/lv_widgets.mk b/src/widgets/lv_widgets.mk
deleted file mode 100644
index 91ab4b925679..000000000000
--- a/src/widgets/lv_widgets.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/widgets/lv_arc.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/widgets/lv_bar.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/widgets/lv_btn.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/widgets/lv_btnmatrix.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/widgets/lv_canvas.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/widgets/lv_checkbox.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/widgets/lv_dropdown.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/widgets/lv_img.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/widgets/lv_label.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/widgets/lv_line.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/widgets/lv_roller.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/widgets/lv_slider.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/widgets/lv_switch.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/widgets/lv_table.o
-OBJS += $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/widgets/lv_textarea.o
-
-DEPPATH += --dep-path $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/widgets
-VPATH += :$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/widgets
-
-INCLUDES += "-I$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/widgets"