From 57154e90bf24a42950f1bb44f8d739f30190da79 Mon Sep 17 00:00:00 2001 From: "chaos.proton@gmail.com" Date: Sun, 18 Nov 2012 08:17:25 +0000 Subject: [PATCH] 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 --- bsp/simulator/SConstruct | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/bsp/simulator/SConstruct b/bsp/simulator/SConstruct index f4128d5fb..57322db1b 100644 --- a/bsp/simulator/SConstruct +++ b/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'),