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
This commit is contained in:
chaos.proton@gmail.com 2012-11-18 08:17:25 +00:00
parent 14709082a5
commit 57154e90bf
1 changed files with 2 additions and 4 deletions

View File

@ -7,8 +7,6 @@ if os.getenv('RTT_ROOT'):
else: else:
RTT_ROOT = os.path.normpath(os.getcwd() + '/../..') 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'): if os.getenv('RTT_RTGUI'):
RTT_RTGUI = os.getenv('RTT_RTGUI') RTT_RTGUI = os.getenv('RTT_RTGUI')
else: else:
@ -65,10 +63,10 @@ if GetDepend('RT_USING_RTGUI'):
env.Append(CPPPATH=sdl_include_path) env.Append(CPPPATH=sdl_include_path)
if RTT_RTGUI: 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', variant_dir='build/components/rtgui',
duplicate=0) 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) variant_dir='build/examples/gui', duplicate=0)
else: else:
objs += SConscript(os.path.join(RTT_ROOT + '/components/rtgui', 'SConscript'), objs += SConscript(os.path.join(RTT_ROOT + '/components/rtgui', 'SConscript'),