arch(env): move rt-thread into env_support folder (lvgl#3025)

yuqingli05 · Jan 19, 2022 · bd243f3 · bd243f3
1 parent 10866ce
commit bd243f3
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git 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 → env_support/rt-thread/SConscript b/rt-thread/SConscript → 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 → env_support/rt-thread/lv_rt_thread_conf.h b/rt-thread/lv_rt_thread_conf.h → env_support/rt-thread/lv_rt_thread_conf.h
diff --git a/rt-thread/lv_rt_thread_port.c → env_support/rt-thread/lv_rt_thread_port.c b/rt-thread/lv_rt_thread_port.c → env_support/rt-thread/lv_rt_thread_port.c