From 3ca98f520d3bb046df4543005952adcc10df94b6 Mon Sep 17 00:00:00 2001 From: Wang_Weigen Date: Tue, 11 Jan 2022 17:51:44 +0800 Subject: [PATCH] repair the compiler error of lvgl --- APP_Framework/Applications/Makefile | 11 +++-------- APP_Framework/Applications/lv_app/Makefile | 2 +- APP_Framework/Applications/{ => lv_app}/lv_init.c | 0 3 files changed, 4 insertions(+), 9 deletions(-) rename APP_Framework/Applications/{ => lv_app}/lv_init.c (100%) diff --git a/APP_Framework/Applications/Makefile b/APP_Framework/Applications/Makefile index 251e972f6..c3815e1bf 100644 --- a/APP_Framework/Applications/Makefile +++ b/APP_Framework/Applications/Makefile @@ -4,21 +4,16 @@ ifeq ($(CONFIG_ADD_NUTTX_FETURES),y) include $(APPDIR)/Make.defs CSRCS += framework_init.c include $(APPDIR)/Application.mk - -ifeq ($(CONFIG_LIB_LV),y) -SRC_FILES += lv_init.c - -SRC_DIR += lv_app endif -ifeq ($(CONFIG_APPLICATION_OTA),y) - SRC_DIR += ota -endif ifeq ($(CONFIG_ADD_XIUOS_FETURES),y) SRC_DIR := general_functions app_test SRC_FILES := main.c framework_init.c + ifeq ($(CONFIG_LIB_LV),y) + SRC_DIR += lv_app + endif ifeq ($(CONFIG_APPLICATION_OTA),y) SRC_DIR += ota diff --git a/APP_Framework/Applications/lv_app/Makefile b/APP_Framework/Applications/lv_app/Makefile index 0efc4bd16..43c648340 100644 --- a/APP_Framework/Applications/lv_app/Makefile +++ b/APP_Framework/Applications/lv_app/Makefile @@ -1,3 +1,3 @@ -SRC_FILES := lv_demo.c lv_demo_calendar.c +SRC_FILES := lv_init.c lv_demo.c lv_demo_calendar.c include $(KERNEL_ROOT)/compiler.mk diff --git a/APP_Framework/Applications/lv_init.c b/APP_Framework/Applications/lv_app/lv_init.c similarity index 100% rename from APP_Framework/Applications/lv_init.c rename to APP_Framework/Applications/lv_app/lv_init.c