From 85ceda00dacffd235156bc811cc42d21267c48f2 Mon Sep 17 00:00:00 2001 From: wuyangyong Date: Tue, 27 Dec 2011 05:41:04 +0000 Subject: fixed rt_device_init issues. git-svn-id: https://rt-thread.googlecode.com/svn/trunk@1882 bbd45198-f89e-11dd-88c7-29a3b14d5316 --- src/SConscript | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) (limited to 'src/SConscript') diff --git a/src/SConscript b/src/SConscript index 6f56c29ca6..afc784f75a 100644 --- a/src/SConscript +++ b/src/SConscript @@ -2,19 +2,7 @@ Import('RTT_ROOT') Import('rtconfig') from building import * -src = Split(''' -device.c -thread.c -scheduler.c -timer.c -irq.c -kservice.c -clock.c -object.c -mempool.c -ipc.c -idle.c -''') +src = Glob('*.c') CPPPATH = [RTT_ROOT + '/include'] if rtconfig.CROSS_TOOL == 'keil' and GetDepend('RT_USING_MODULE') == True: @@ -22,14 +10,14 @@ if rtconfig.CROSS_TOOL == 'keil' and GetDepend('RT_USING_MODULE') == True: else: LINKFLAGS = '' -if GetDepend('RT_USING_MODULE'): - src += Split('rtm.c') - src += Split('module.c') +if GetDepend('RT_USING_MODULE') == False: + SrcRemove(src, ['rtm.c', 'module.c']) -if GetDepend('RT_USING_SLAB'): - src += Split('slab.c') -else: - src += Split('mem.c') +if GetDepend('RT_USING_HEAP') == False or GetDepend('RT_USING_SMALL_MEM') == False: + SrcRemove(src, ['mem.c']) + +if GetDepend('RT_USING_HEAP') == False or GetDepend('RT_USING_SLAB') == False: + SrcRemove(src, ['slab.c']) group = DefineGroup('Kernel', src, depend = [''], CPPPATH = CPPPATH, LINKFLAGS = LINKFLAGS) -- cgit v1.3.1