update simulator/SConstruct
git-svn-id: https://rt-thread.googlecode.com/svn/trunk@2417 bbd45198-f89e-11dd-88c7-29a3b14d5316
This commit is contained in:
parent
3012a3abb5
commit
50d69f69f6
|
@ -9,8 +9,13 @@ else:
|
||||||
|
|
||||||
# if you want use the rtgui in the svn (in google code), you should
|
# if you want use the rtgui in the svn (in google code), you should
|
||||||
# comment the following line
|
# comment the following line
|
||||||
RTT_RTGUI = os.path.normpath('F:/Project/git/rt-gui')
|
if os.getenv('RTT_RTGUI'):
|
||||||
#RTT_RTGUI =''
|
RTT_RTGUI = 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('F:/Project/git/rt-gui')
|
||||||
|
RTT_RTGUI =''
|
||||||
|
|
||||||
sys.path = sys.path + [os.path.join(RTT_ROOT, 'tools')]
|
sys.path = sys.path + [os.path.join(RTT_ROOT, 'tools')]
|
||||||
from building import *
|
from building import *
|
||||||
|
@ -52,14 +57,8 @@ env['LIBS']=libs
|
||||||
env['CPPDEFINES']=definitions
|
env['CPPDEFINES']=definitions
|
||||||
|
|
||||||
# prepare building environment
|
# prepare building environment
|
||||||
if RTT_RTGUI:
|
|
||||||
objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False, remove_components=['rtgui'])
|
|
||||||
objs += SConscript(os.path.join(RTT_RTGUI + '/components/rtgui', 'SConscript'),
|
|
||||||
variant_dir='build/components/rtgui',
|
|
||||||
duplicate=0)
|
|
||||||
else:
|
|
||||||
objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False)
|
|
||||||
|
|
||||||
|
objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False, remove_components=['rtgui'])
|
||||||
if GetDepend('RT_USING_RTGUI'):
|
if GetDepend('RT_USING_RTGUI'):
|
||||||
sdl_lib = ['SDL', 'SDLmain']
|
sdl_lib = ['SDL', 'SDLmain']
|
||||||
sdl_lib_path = os.path.normpath('SDL/lib/x86')
|
sdl_lib_path = os.path.normpath('SDL/lib/x86')
|
||||||
|
@ -69,9 +68,15 @@ 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'),
|
||||||
|
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)
|
variant_dir='build/examples/gui', duplicate=0)
|
||||||
else:
|
else:
|
||||||
|
objs += SConscript(os.path.join(RTT_ROOT + '/components/rtgui', 'SConscript'),
|
||||||
|
variant_dir='build/components/rtgui',
|
||||||
|
duplicate=0)
|
||||||
objs = objs + SConscript(RTT_ROOT + '/examples/gui/SConscript',
|
objs = objs + SConscript(RTT_ROOT + '/examples/gui/SConscript',
|
||||||
variant_dir='build/examples/gui', duplicate=0)
|
variant_dir='build/examples/gui', duplicate=0)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue