diff --git a/demos/lv_demos.mk b/demos/lv_demos.mk deleted file mode 100644 index ba5763d76f..0000000000 --- a/demos/lv_demos.mk +++ /dev/null @@ -1 +0,0 @@ -CSRCS += $(shell find -L $(LVGL_DIR)/$(LVGL_DIR_NAME)/demos -name "*.c") diff --git a/examples/lv_examples.mk b/examples/lv_examples.mk deleted file mode 100644 index b8fa7eb5a2..0000000000 --- a/examples/lv_examples.mk +++ /dev/null @@ -1 +0,0 @@ -CSRCS += $(shell find -L $(LVGL_DIR)/$(LVGL_DIR_NAME)/examples -name \*.c) diff --git a/lvgl.mk b/lvgl.mk index 020cdb1adc..af6e6c2422 100644 --- a/lvgl.mk +++ b/lvgl.mk @@ -1,4 +1,6 @@ -CSRCS += $(shell find $(LVGL_DIR_NAME)/src -type f -name '*.c') -CSRCS += $(shell find $(LVGL_DIR_NAME)/demos -type f -name '*.c') -CSRCS += $(shell find $(LVGL_DIR_NAME)/examples -type f -name '*.c') -CFLAGS += "-I$(LVGL_DIR)/$(LVGL_DIR_NAME)" +LVGL_PATH ?= ${shell pwd}/lvgl + +CSRCS += $(shell find $(LVGL_PATH)/src -type f -name '*.c') +CSRCS += $(shell find $(LVGL_PATH)/demos -type f -name '*.c') +CSRCS += $(shell find $(LVGL_PATH)/examples -type f -name '*.c') +CFLAGS += "-I$(LVGL_PATH)" diff --git a/src/core/lv_core.mk b/src/core/lv_core.mk deleted file mode 100644 index aa8ccfb08c..0000000000 --- a/src/core/lv_core.mk +++ /dev/null @@ -1,20 +0,0 @@ -CSRCS += lv_disp.c -CSRCS += lv_event.c -CSRCS += lv_group.c -CSRCS += lv_indev.c -CSRCS += lv_indev_scroll.c -CSRCS += lv_obj.c -CSRCS += lv_obj_class.c -CSRCS += lv_obj_draw.c -CSRCS += lv_obj_pos.c -CSRCS += lv_obj_scroll.c -CSRCS += lv_obj_style.c -CSRCS += lv_obj_style_gen.c -CSRCS += lv_obj_tree.c -CSRCS += lv_refr.c -CSRCS += lv_theme.c - -DEPPATH += --dep-path $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/core -VPATH += :$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/core - -CFLAGS += "-I$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/core" diff --git a/src/draw/arm2d/lv_draw_arm2d.mk b/src/draw/arm2d/lv_draw_arm2d.mk deleted file mode 100644 index 17219b07ea..0000000000 --- a/src/draw/arm2d/lv_draw_arm2d.mk +++ /dev/null @@ -1,6 +0,0 @@ -CSRCS += lv_gpu_arm2d.c - -DEPPATH += --dep-path $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/arm2d -VPATH += :$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/arm2d - -CFLAGS += "-I$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/arm2d" diff --git a/src/draw/lv_draw.mk b/src/draw/lv_draw.mk deleted file mode 100644 index 34ce244f50..0000000000 --- a/src/draw/lv_draw.mk +++ /dev/null @@ -1,25 +0,0 @@ -CSRCS += lv_draw.c -CSRCS += lv_draw_arc.c -CSRCS += lv_draw_img.c -CSRCS += lv_draw_label.c -CSRCS += lv_draw_layer.c -CSRCS += lv_draw_line.c -CSRCS += lv_draw_mask.c -CSRCS += lv_draw_rect.c -CSRCS += lv_draw_transform.c -CSRCS += lv_draw_triangle.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/draw -VPATH += :$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw - -CFLAGS += "-I$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw" - -include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/arm2d/lv_draw_arm2d.mk -include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/nxp/lv_draw_nxp.mk -include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/sdl/lv_draw_sdl.mk -include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/stm32_dma2d/lv_draw_stm32_dma2d.mk -include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/sw/lv_draw_sw.mk -include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/swm341_dma2d/lv_draw_swm341_dma2d.mk diff --git a/src/draw/nxp/lv_draw_nxp.mk b/src/draw/nxp/lv_draw_nxp.mk deleted file mode 100644 index 17371ac984..0000000000 --- a/src/draw/nxp/lv_draw_nxp.mk +++ /dev/null @@ -1,9 +0,0 @@ -CSRCS += lv_gpu_nxp.c - -DEPPATH += --dep-path $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/nxp -VPATH += :$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/nxp - -CFLAGS += "-I$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/nxp" - -include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/nxp/pxp/lv_draw_nxp_pxp.mk -include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/nxp/vglite/lv_draw_nxp_vglite.mk diff --git a/src/draw/nxp/pxp/lv_draw_nxp_pxp.mk b/src/draw/nxp/pxp/lv_draw_nxp_pxp.mk deleted file mode 100644 index ff475a1932..0000000000 --- a/src/draw/nxp/pxp/lv_draw_nxp_pxp.mk +++ /dev/null @@ -1,8 +0,0 @@ -CSRCS += lv_draw_pxp_blend.c -CSRCS += lv_gpu_nxp_pxp_osa.c -CSRCS += lv_gpu_nxp_pxp.c - -DEPPATH += --dep-path $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/nxp/pxp -VPATH += :$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/nxp/pxp - -CFLAGS += "-I$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/nxp/pxp" diff --git a/src/draw/nxp/vglite/lv_draw_nxp_vglite.mk b/src/draw/nxp/vglite/lv_draw_nxp_vglite.mk deleted file mode 100644 index c84e2e47a3..0000000000 --- a/src/draw/nxp/vglite/lv_draw_nxp_vglite.mk +++ /dev/null @@ -1,9 +0,0 @@ -CSRCS += lv_draw_vglite_arc.c -CSRCS += lv_draw_vglite_blend.c -CSRCS += lv_draw_vglite_rect.c -CSRCS += lv_gpu_nxp_vglite.c - -DEPPATH += --dep-path $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/nxp/vglite -VPATH += :$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/nxp/vglite - -CFLAGS += "-I$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/nxp/vglite" diff --git a/src/draw/sdl/lv_draw_sdl.mk b/src/draw/sdl/lv_draw_sdl.mk deleted file mode 100644 index 3bc50fab94..0000000000 --- a/src/draw/sdl/lv_draw_sdl.mk +++ /dev/null @@ -1,19 +0,0 @@ -CSRCS += lv_draw_sdl.c -CSRCS += lv_draw_sdl_arc.c -CSRCS += lv_draw_sdl_bg.c -CSRCS += lv_draw_sdl_composite.c -CSRCS += lv_draw_sdl_img.c -CSRCS += lv_draw_sdl_label.c -CSRCS += lv_draw_sdl_layer.c -CSRCS += lv_draw_sdl_line.c -CSRCS += lv_draw_sdl_mask.c -CSRCS += lv_draw_sdl_polygon.c -CSRCS += lv_draw_sdl_rect.c -CSRCS += lv_draw_sdl_stack_blur.c -CSRCS += lv_draw_sdl_texture_cache.c -CSRCS += lv_draw_sdl_utils.c - -DEPPATH += --dep-path $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/sdl -VPATH += :$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/sdl - -CFLAGS += "-I$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/sdl" diff --git a/src/draw/stm32_dma2d/lv_draw_stm32_dma2d.mk b/src/draw/stm32_dma2d/lv_draw_stm32_dma2d.mk deleted file mode 100644 index 8ed00b015a..0000000000 --- a/src/draw/stm32_dma2d/lv_draw_stm32_dma2d.mk +++ /dev/null @@ -1,6 +0,0 @@ -CSRCS += lv_gpu_stm32_dma2d.c - -DEPPATH += --dep-path $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/stm32_dma2d -VPATH += :$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/stm32_dma2d - -CFLAGS += "-I$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/stm32_dma2d" diff --git a/src/draw/sw/lv_draw_sw.mk b/src/draw/sw/lv_draw_sw.mk deleted file mode 100644 index 4625cbcfc8..0000000000 --- a/src/draw/sw/lv_draw_sw.mk +++ /dev/null @@ -1,17 +0,0 @@ -CSRCS += lv_draw_sw.c -CSRCS += lv_draw_sw_arc.c -CSRCS += lv_draw_sw_blend.c -CSRCS += lv_draw_sw_dither.c -CSRCS += lv_draw_sw_gradient.c -CSRCS += lv_draw_sw_img.c -CSRCS += lv_draw_sw_letter.c -CSRCS += lv_draw_sw_line.c -CSRCS += lv_draw_sw_polygon.c -CSRCS += lv_draw_sw_rect.c -CSRCS += lv_draw_sw_transform.c -CSRCS += lv_draw_sw_layer.c - -DEPPATH += --dep-path $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/sw -VPATH += :$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/sw - -CFLAGS += "-I$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/sw" diff --git a/src/draw/swm341_dma2d/lv_draw_swm341_dma2d.mk b/src/draw/swm341_dma2d/lv_draw_swm341_dma2d.mk deleted file mode 100644 index bc19e38024..0000000000 --- a/src/draw/swm341_dma2d/lv_draw_swm341_dma2d.mk +++ /dev/null @@ -1,6 +0,0 @@ -CSRCS += lv_gpu_swm341_dma2d.c - -DEPPATH += --dep-path $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/swm341_dma2d -VPATH += :$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/swm341_dma2d - -CFLAGS += "-I$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/swm341_dma2d" diff --git a/src/font/korean.ttf b/src/font/korean.ttf deleted file mode 100644 index e0ec117ac6..0000000000 Binary files a/src/font/korean.ttf and /dev/null differ diff --git a/src/font/lv_font.mk b/src/font/lv_font.mk deleted file mode 100644 index 2201b73f22..0000000000 --- a/src/font/lv_font.mk +++ /dev/null @@ -1,36 +0,0 @@ -CSRCS += lv_font.c -CSRCS += lv_font_fmt_txt.c -CSRCS += lv_font_loader.c - -CSRCS += lv_font_dejavu_16_persian_hebrew.c -CSRCS += lv_font_montserrat_8.c -CSRCS += lv_font_montserrat_10.c -CSRCS += lv_font_montserrat_12.c -CSRCS += lv_font_montserrat_12_subpx.c -CSRCS += lv_font_montserrat_14.c -CSRCS += lv_font_montserrat_16.c -CSRCS += lv_font_montserrat_18.c -CSRCS += lv_font_montserrat_20.c -CSRCS += lv_font_montserrat_22.c -CSRCS += lv_font_montserrat_24.c -CSRCS += lv_font_montserrat_26.c -CSRCS += lv_font_montserrat_28.c -CSRCS += lv_font_montserrat_28_compressed.c -CSRCS += lv_font_montserrat_30.c -CSRCS += lv_font_montserrat_32.c -CSRCS += lv_font_montserrat_34.c -CSRCS += lv_font_montserrat_36.c -CSRCS += lv_font_montserrat_38.c -CSRCS += lv_font_montserrat_40.c -CSRCS += lv_font_montserrat_42.c -CSRCS += lv_font_montserrat_44.c -CSRCS += lv_font_montserrat_46.c -CSRCS += lv_font_montserrat_48.c -CSRCS += lv_font_simsun_16_cjk.c -CSRCS += lv_font_unscii_8.c -CSRCS += lv_font_unscii_16.c - -DEPPATH += --dep-path $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/font -VPATH += :$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/font - -CFLAGS += "-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 c35ec2d7a5..0000000000 --- a/src/hal/lv_hal.mk +++ /dev/null @@ -1,8 +0,0 @@ -CSRCS += lv_hal_disp.c -CSRCS += lv_hal_indev.c -CSRCS += lv_hal_tick.c - -DEPPATH += --dep-path $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/hal -VPATH += :$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/hal - -CFLAGS += "-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 1675ecb8ca..0000000000 --- a/src/misc/lv_misc.mk +++ /dev/null @@ -1,27 +0,0 @@ -CSRCS += lv_anim.c -CSRCS += lv_anim_timeline.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_lru.c -CSRCS += lv_math.c -CSRCS += lv_mem.c -CSRCS += lv_mem_builtin.c -CSRCS += lv_printf.c -CSRCS += lv_style.c -CSRCS += lv_style_gen.c -CSRCS += lv_timer.c -CSRCS += lv_tlsf.c -CSRCS += lv_txt.c -CSRCS += lv_txt_ap.c -CSRCS += lv_utils.c - -DEPPATH += --dep-path $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/misc -VPATH += :$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/misc - -CFLAGS += "-I$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/misc" diff --git a/tests/makefile/Makefile b/tests/makefile/Makefile index bcfe5da3a9..d3d7dd8ebf 100644 --- a/tests/makefile/Makefile +++ b/tests/makefile/Makefile @@ -1,8 +1,8 @@ -LVGL_DIR := $(CURDIR)/../.. +LVGL_PATH := $(CURDIR)/../.. include ../../lvgl.mk CSRCS += test.c -CFLAGS += -DLV_CONF_SKIP=1 -I$(LVGL_DIR)/.. +CFLAGS += -DLV_CONF_SKIP=1 -I$(LVGL_PATH)/.. COBJS := $(patsubst %.c, %.o, $(CSRCS)) test_file: $(COBJS)