diff --git a/FreeRTOS/SConscript b/FreeRTOS/SConscript
index 0586c3c..e38c6af 100644
--- a/FreeRTOS/SConscript
+++ b/FreeRTOS/SConscript
@@ -3,10 +3,25 @@ from building import *
 
 cwd = GetCurrentDir()
 src	= Glob('*.c')
-src += Glob(os.path.join("portable", "rt-thread", "*.c"))
-src += Glob(os.path.join("portable", "MemMang", "heap_3.c"))
+CPPPATH = [os.path.join(cwd, "include", "freertos"), os.path.join(cwd, "include")]
 
-CPPPATH = [os.path.join(cwd, "include", "freertos"), os.path.join(cwd, "portable", "rt-thread")]
+if GetDepend(['PKG_USING_ESP_IDF']):
+  src += Split("""
+    portable/esp-idf/port_rt.c
+    portable/esp-idf/riscv/port.c
+    portable/esp-idf/port_common.c
+  """)
+  CPPPATH += Split("""
+    portable/esp-idf/riscv/include
+    portable/esp-idf/riscv/include/freertos
+  """)
+
+if GetDepend('PKG_FREERTOS_WRAPPER_USING_RTTHREAD') :
+  src += Glob(os.path.join("portable", "rt-thread", "*.c"))
+  CPPPATH += [ os.path.join(cwd, "portable", "rt-thread")]
+
+if GetDepend('PKG_FREERTOS_WRAPPER_USING_MEMANG') :
+  src += Glob(os.path.join("portable", "MemMang", "heap_3.c"))
 
 group = DefineGroup('FreeRTOS', src, depend = [''], CPPPATH = CPPPATH)
 
diff --git a/SConscript b/SConscript
index cce859b..3d15055 100644
--- a/SConscript
+++ b/SConscript
@@ -5,9 +5,6 @@ cwd = GetCurrentDir()
 objs = []
 list = os.listdir(cwd)
 
-if (GetDepend(['PKG_USING_ESP_IDF']) or GetDepend(['BSP_USING_LOCAL_ESP_IDF'])):
-    Return('objs')
-
 for d in list:
     path = os.path.join(cwd, d)
     if os.path.isfile(os.path.join(path, 'SConscript')):