diff options
| author | Grissiom <[email protected]> | 2013-09-06 21:32:27 +0800 |
|---|---|---|
| committer | Grissiom <[email protected]> | 2013-09-06 21:49:53 +0800 |
| commit | c6e81b58d9da3866287b02f48e231db7d272acd5 (patch) | |
| tree | dc724adf438bc8ae450cd1b9ab5bf774c855d3be /bsp/simulator | |
| parent | 3ebc76652197b47e117ed2a856786a4d199d79a7 (diff) | |
simulator: move SDL setting staff into drivers/SConstruct
This could not only make a cleaner SConstruct, but could also benefit
RTGUI building.
Diffstat (limited to 'bsp/simulator')
| -rwxr-xr-x | bsp/simulator/SConstruct | 7 | ||||
| -rw-r--r-- | bsp/simulator/drivers/SConscript | 14 |
2 files changed, 11 insertions, 10 deletions
diff --git a/bsp/simulator/SConstruct b/bsp/simulator/SConstruct index af6534906b..b2e958e65b 100755 --- a/bsp/simulator/SConstruct +++ b/bsp/simulator/SConstruct @@ -84,13 +84,6 @@ else: objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False, remove_components=['rtgui']) if GetDepend('RT_USING_RTGUI'): - sdl_lib = ['SDL', 'SDLmain'] - sdl_lib_path = [os.path.abspath('SDL/lib/x86')] - sdl_include_path = [os.path.abspath('SDL/include')] - env.Append(LIBS=sdl_lib) - env.Append(LIBPATH=sdl_lib_path) - env.Append(CPPPATH=sdl_include_path) - if RTT_RTGUI: objs += SConscript(os.path.join(RTT_RTGUI, 'SConscript'), variant_dir='build/components/rtgui', diff --git a/bsp/simulator/drivers/SConscript b/bsp/simulator/drivers/SConscript index d939535da8..eb491b810e 100644 --- a/bsp/simulator/drivers/SConscript +++ b/bsp/simulator/drivers/SConscript @@ -3,10 +3,19 @@ from building import * cwd = GetCurrentDir() src = Glob('*.c') +LIBS = [] +LIBPATH = [] +CPPPATH = [cwd] # remove no need file. if GetDepend('RT_USING_RTGUI') == False: SrcRemove(src, 'sdl_fb.c') +else: + LIBS.append('SDL') + if sys.platform == 'win32': + LIBPATH.append(os.path.abspath(os.path.join(cwd, '../SDL/lib/x86'))) + CPPPATH.append(os.path.abspath(os.path.join(cwd, '../SDL/include'))) + 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_MTD_NAND') == False: @@ -20,8 +29,7 @@ if GetDepend('RT_USING_MODULE') == False: if sys.platform[0:5]=="linux": #check whether under linux SrcRemove(src, ['module_win32.c', 'dfs_win32.c']) -CPPPATH = [cwd] - -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('Drivers', src, depend = [''], + CPPPATH = CPPPATH, LIBS=LIBS, LIBPATH=LIBPATH) Return('group') |