From ae300acb2f7c5576f7b54df4ef3ece5ef068694d Mon Sep 17 00:00:00 2001
From: "Man, Jianting (Meco)" <920369182@qq.com>
Date: Mon, 28 Nov 2022 13:38:29 -0500
Subject: [PATCH] =?UTF-8?q?[v8.3.x][rt-thread][squareline]=20fix=20compile?=
 =?UTF-8?q?r=20cannot=20find=20the=20lvgl/lvg=E2=80=A6=20(#3834)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 env_support/rt-thread/squareline/SConscript       |  7 ++-----
 .../rt-thread/squareline/{ui => }/lv_ui_entry.c   |  2 +-
 env_support/rt-thread/squareline/ui/lvgl/lvgl.h   | 15 +++++++++++++++
 3 files changed, 18 insertions(+), 6 deletions(-)
 rename env_support/rt-thread/squareline/{ui => }/lv_ui_entry.c (88%)
 create mode 100644 env_support/rt-thread/squareline/ui/lvgl/lvgl.h

diff --git a/env_support/rt-thread/squareline/SConscript b/env_support/rt-thread/squareline/SConscript
index 89a509973f..51edf228e2 100644
--- a/env_support/rt-thread/squareline/SConscript
+++ b/env_support/rt-thread/squareline/SConscript
@@ -1,13 +1,10 @@
 from building import *
 
 cwd = GetCurrentDir()
-group = []
-src = []
-CPPPATH =[]
+src = ['lv_ui_entry.c']
 
 src += Glob(cwd + '/ui/*.c')
-CPPPATH += [cwd+'/ui']
 
-group = group + DefineGroup('LVGL-SquareLine', src, depend = ['PKG_USING_LVGL_SQUARELINE'], CPPPATH = CPPPATH)
+group = DefineGroup('LVGL-SquareLine', src, depend = ['PKG_USING_LVGL_SQUARELINE'])
 
 Return('group')
diff --git a/env_support/rt-thread/squareline/ui/lv_ui_entry.c b/env_support/rt-thread/squareline/lv_ui_entry.c
similarity index 88%
rename from env_support/rt-thread/squareline/ui/lv_ui_entry.c
rename to env_support/rt-thread/squareline/lv_ui_entry.c
index 838b53c9f9..f08e1f58db 100644
--- a/env_support/rt-thread/squareline/ui/lv_ui_entry.c
+++ b/env_support/rt-thread/squareline/lv_ui_entry.c
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2006-2022, RT-Thread Development Team
  *
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: MIT
  *
  * Change Logs:
  * Date           Author        Notes
diff --git a/env_support/rt-thread/squareline/ui/lvgl/lvgl.h b/env_support/rt-thread/squareline/ui/lvgl/lvgl.h
new file mode 100644
index 0000000000..f2d518f4de
--- /dev/null
+++ b/env_support/rt-thread/squareline/ui/lvgl/lvgl.h
@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2006-2021, RT-Thread Development Team
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ * Change Logs:
+ * Date           Author       Notes
+ * 2022-11-20     Meco Man     The first version
+ */
+
+#ifdef __RTTHREAD__
+
+#include "../../../../../lvgl.h" /* back to the root folder's lvgl.h */
+
+#endif /* __RTTHREAD__ */