update SCons script in bsp/simulator

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@2460 bbd45198-f89e-11dd-88c7-29a3b14d5316

3 files changed, 17 insertions, 27 deletions

diff --git a/bsp/simulator/SConstruct b/bsp/simulator/SConstruct
index ae5bc8097f..25ade08977 100644
--- a/bsp/simulator/SConstruct
+++ b/bsp/simulator/SConstruct
@@ -12,8 +12,8 @@ if os.getenv('RTT_RTGUI'):
 else:

     # set the rtgui root directory by hand

     # empty string means use the RTGUI in svn

-    # RTT_RTGUI = os.path.normpath(r'F:\Project\git\rt-gui\components\rtgui')

-    RTT_RTGUI =''

+    RTT_RTGUI = os.path.normpath(r'F:\Project\git\rt-gui\components\rtgui')

+    # RTT_RTGUI =''

 

 sys.path = sys.path + [os.path.join(RTT_ROOT, 'tools')]

 from building import *

@@ -76,7 +76,7 @@ if GetDepend('RT_USING_RTGUI'):
 				variant_dir='build/examples/gui', duplicate=0)

 

 # build program 

-env.Program(TARGET, objs)

+program = env.Program(TARGET, objs)

 

-# end building 

-EndBuilding(TARGET)

+# end building

+EndBuilding(TARGET, program)

diff --git a/bsp/simulator/drivers/SConscript b/bsp/simulator/drivers/SConscript
index e97a5018a5..d131ce7f42 100644
--- a/bsp/simulator/drivers/SConscript
+++ b/bsp/simulator/drivers/SConscript
@@ -8,9 +8,9 @@ if GetDepend('RT_USING_RTGUI') == False:
     SrcRemove(src, 'sdl_fb.c')

 if GetDepend('RT_USING_DFS') == False or GetDepend('RT_USING_DFS_ELMFAT') == False:

     SrcRemove(src, 'sd_sim.c')

-if GetDepend('RT_USING_DFS') == False or GetDepend('RT_USING_DFS_UFFS') == False:

+if GetDepend('RT_USING_DFS') == False or GetDepend('RT_USING_MTD_NAND') == False:

     SrcRemove(src, 'nand_sim.c')

-if GetDepend('RT_USING_DFS') == False or GetDepend('RT_USING_DFS_JFFS2') == False:

+if GetDepend('RT_USING_DFS') == False or GetDepend('RT_USING_MTD_NOR') == False:

     SrcRemove(src, 'sst25vfxx_mtd_sim.c')

 

 CPPPATH = [cwd]

diff --git a/bsp/simulator/snake/SConscript b/bsp/simulator/snake/SConscript
index e97a5018a5..a5734dc40c 100644
--- a/bsp/simulator/snake/SConscript
+++ b/bsp/simulator/snake/SConscript
@@ -1,20 +1,10 @@
-from building import *

-

-cwd = GetCurrentDir()

-src = Glob('*.c')

-

-# remove no need file.

-if GetDepend('RT_USING_RTGUI') == False:

-    SrcRemove(src, 'sdl_fb.c')

-if GetDepend('RT_USING_DFS') == False or GetDepend('RT_USING_DFS_ELMFAT') == False:

-    SrcRemove(src, 'sd_sim.c')

-if GetDepend('RT_USING_DFS') == False or GetDepend('RT_USING_DFS_UFFS') == False:

-    SrcRemove(src, 'nand_sim.c')

-if GetDepend('RT_USING_DFS') == False or GetDepend('RT_USING_DFS_JFFS2') == False:

-    SrcRemove(src, 'sst25vfxx_mtd_sim.c')

-

-CPPPATH = [cwd]

-

-group = DefineGroup('Drivers', src, depend = [''], CPPPATH = CPPPATH)

-

-Return('group')

+import rtconfig
+from building import *
+
+src = Glob('*.c') + Glob('*.cpp')
+cwd = GetCurrentDir()
+
+CPPPATH = [cwd]
+group = DefineGroup('snake', src, depend = ['RT_USING_RTGUI'], CPPPATH=CPPPATH)
+
+Return('group')