Browse Source

bsp/simulator: make RTT_RTGUI compatible with previous definition

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@2424 bbd45198-f89e-11dd-88c7-29a3b14d5316
chaos.proton@gmail.com 12 years ago
parent
commit
57154e90bf
1 changed files with 2 additions and 4 deletions
  1. 2 4
      bsp/simulator/SConstruct

+ 2 - 4
bsp/simulator/SConstruct

@@ -7,8 +7,6 @@ if os.getenv('RTT_ROOT'):
 else:
     RTT_ROOT = os.path.normpath(os.getcwd() + '/../..')
 
-# if you want use the rtgui in the svn (in google code), you should
-# comment the following line
 if os.getenv('RTT_RTGUI'):
     RTT_RTGUI = os.getenv('RTT_RTGUI')
 else:
@@ -65,10 +63,10 @@ if GetDepend('RT_USING_RTGUI'):
     env.Append(CPPPATH=sdl_include_path)
 
     if RTT_RTGUI:
-        objs += SConscript(os.path.join(RTT_RTGUI + '/components/rtgui', 'SConscript'),
+        objs += SConscript(os.path.join(RTT_RTGUI, 'SConscript'),
 						   variant_dir='build/components/rtgui',
 						   duplicate=0)
-        objs = objs + SConscript(RTT_RTGUI+'/demo/examples/SConscript', 
+        objs = objs + SConscript(RTT_RTGUI+'/../../demo/examples/SConscript', 
 				variant_dir='build/examples/gui', duplicate=0)
     else:
         objs += SConscript(os.path.join(RTT_ROOT + '/components/rtgui', 'SConscript'),