From a7c1e7c3a495d6058c586f340787b396f919976b Mon Sep 17 00:00:00 2001
From: "bernard.xiong" <bernard.xiong@gmail.com>
Date: Wed, 21 Oct 2009 05:54:48 +0000
Subject: [PATCH] update scons build script

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@117 bbd45198-f89e-11dd-88c7-29a3b14d5316
---
 bsp/stm3210/SConstruct | 19 +------------------
 net/lwip/SConscript    |  4 ++--
 2 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/bsp/stm3210/SConstruct b/bsp/stm3210/SConstruct
index d526877e14..97753d6d74 100644
--- a/bsp/stm3210/SConstruct
+++ b/bsp/stm3210/SConstruct
@@ -44,26 +44,9 @@ cflags = cc_cflags
 
 # search path for C compiler 
 kernel_path = [RTT_ROOT + '/include', RTT_ROOT + '/libcpu/' + rtconfig.ARCH + '/' + rtconfig.CPU]
-finsh_path = [RTT_ROOT + '/finsh']
-dfs_path = [RTT_ROOT + '/filesystem/dfs/include', RTT_ROOT + '/filesystem/dfs']
-lwip_path = [RTT_ROOT + '/net/lwip/src', RTT_ROOT + '/net/lwip/src/include', RTT_ROOT + '/net/lwip/src/include/ipv4', RTT_ROOT + '/net/lwip/src/arch/include']
 bsp_path = [RTT_ROOT + '/bsp/stm3210', RTT_ROOT + '/bsp/stm3210/Libraries/STM32F10x_StdPeriph_Driver/inc', RTT_ROOT + '/bsp/stm3210/Libraries/CMSIS/Core/CM3']
-minilibc_path = [RTT_ROOT + '/libc/minilibc']
 
-cpath  = kernel_path
-if rtconfig.RT_USING_FINSH:
-	cpath = cpath + finsh_path
-
-if rtconfig.RT_USING_DFS:
-	cpath = cpath + dfs_path
-
-if rtconfig.RT_USING_LWIP:
-	cpath = cpath + lwip_path
-
-if rtconfig.RT_USING_MINILIBC:
-	cpath = cpath + minilibc_path
-
-cpath = cpath + [cc_cpath] + bsp_path
+cpath  = kernel_path + bsp_path
 
 # link flag
 lflags = device + cc_lflags
diff --git a/net/lwip/SConscript b/net/lwip/SConscript
index 8c1d1cc474..9e8ec15fdd 100644
--- a/net/lwip/SConscript
+++ b/net/lwip/SConscript
@@ -60,11 +60,11 @@ src/netif/ppp/vj.c
 """)
 
 # The set of source files associated with this SConscript file.
-path = [RTT_ROOT + '/net/lwip/src/include', RTT_ROOT + '/net/lwip/src/include/ipv4', RTT_ROOT + '/net/lwip/src/arch/include/arch', RTT_ROOT + '/net/lwip/src/include/netif', RTT_ROOT + '/net/lwip/src/netif/ppp']
+path = [RTT_ROOT + '/net/lwip/src', RTT_ROOT + '/net/lwip/src/include', RTT_ROOT + '/net/lwip/src/include/ipv4', RTT_ROOT + '/net/lwip/src/arch/include', RTT_ROOT + '/net/lwip/src/include/netif', RTT_ROOT + '/net/lwip/src/netif/ppp']
 
 env.Clone()
 env.Append(CPPPATH = path)
 
-obj = lwip_env.Object(src_local)
+obj = env.Object(src_local)
 
 Return('obj')
-- 
GitLab