From bd243f31240d48412968a2d2dc47e3953db34ec9 Mon Sep 17 00:00:00 2001
From: "Man, Jianting (Meco)" <920369182@qq.com>
Date: Wed, 19 Jan 2022 16:10:54 -0500
Subject: [PATCH] arch(env): move rt-thread into env_support folder (#3025)

---
 SConscript                                             |  2 +-
 {rt-thread => env_support/rt-thread}/SConscript        | 10 +++++++++-
 .../rt-thread}/lv_rt_thread_conf.h                     |  0
 .../rt-thread}/lv_rt_thread_port.c                     |  0
 4 files changed, 10 insertions(+), 2 deletions(-)
 rename {rt-thread => env_support/rt-thread}/SConscript (88%)
 rename {rt-thread => env_support/rt-thread}/lv_rt_thread_conf.h (100%)
 rename {rt-thread => env_support/rt-thread}/lv_rt_thread_port.c (100%)

diff --git a/SConscript b/SConscript
index 841579ed8f..d457d9a47d 100644
--- a/SConscript
+++ b/SConscript
@@ -6,6 +6,6 @@ from building import *
 objs = []
 cwd  = GetCurrentDir()
 
-objs = objs + SConscript(cwd + '/rt-thread/SConscript')
+objs = objs + SConscript(cwd + '/env_support/rt-thread/SConscript')
 
 Return('objs')
diff --git a/rt-thread/SConscript b/env_support/rt-thread/SConscript
similarity index 88%
rename from rt-thread/SConscript
rename to env_support/rt-thread/SConscript
index 8f215b0147..7f6048404a 100644
--- a/rt-thread/SConscript
+++ b/env_support/rt-thread/SConscript
@@ -9,7 +9,7 @@ cwd = GetCurrentDir()
 src = []
 inc = []
 
-lvgl_cwd = cwd + '/../'
+lvgl_cwd = cwd + '/../../'
 
 lvgl_src_cwd = lvgl_cwd + 'src/'
 inc = inc + [lvgl_src_cwd]
@@ -26,6 +26,14 @@ if GetDepend('PKG_USING_LVGL_EXAMPLES'):
             src = src + Glob(os.path.join(root,dir,'*.c'))
             inc = inc + [os.path.join(root,dir)]
 
+if GetDepend('PKG_USING_LVGL_DEMOS'):
+    lvgl_src_cwd = lvgl_cwd + 'demos/'
+    inc = inc + [lvgl_src_cwd]
+    for root, dirs, files in os.walk(lvgl_src_cwd):
+        for dir in dirs:
+            src = src + Glob(os.path.join(root,dir,'*.c'))
+            inc = inc + [os.path.join(root,dir)]
+
 LOCAL_CCFLAGS = ''
 if rtconfig.PLATFORM == 'gcc': # GCC
     LOCAL_CCFLAGS += ' -std=c99'
diff --git a/rt-thread/lv_rt_thread_conf.h b/env_support/rt-thread/lv_rt_thread_conf.h
similarity index 100%
rename from rt-thread/lv_rt_thread_conf.h
rename to env_support/rt-thread/lv_rt_thread_conf.h
diff --git a/rt-thread/lv_rt_thread_port.c b/env_support/rt-thread/lv_rt_thread_port.c
similarity index 100%
rename from rt-thread/lv_rt_thread_port.c
rename to env_support/rt-thread/lv_rt_thread_port.c