libs/rt-thread
libs/rt-thread
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update on scons script

Browse Source 
git-svn-id: https://rt-thread.googlecode.com/svn/trunk@118 bbd45198-f89e-11dd-88c7-29a3b14d5316
This commit is contained in:
bernard.xiong 2009-10-21 23:50:25 +00:00
parent a7c1e7c3a4
commit 9ba0621463
4 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libcpu/SConscript
View File

@ -1,5 +1,6 @@
Import('env') Import('env')
Import('rtconfig') Import('rtconfig')
Import('RTT_ROOT')
comm = rtconfig.ARCH + '/common' comm = rtconfig.ARCH + '/common'
path = rtconfig.ARCH + '/' + rtconfig.CPU path = rtconfig.ARCH + '/' + rtconfig.CPU
@ -14,5 +15,7 @@ if rtconfig.CC == 'gcc':
if rtconfig.CC == 'iar': if rtconfig.CC == 'iar':
src_local = Glob(path + '/*.c') + Glob(path + '/*_iar.s') + Glob(comm + '/*.c') src_local = Glob(path + '/*.c') + Glob(path + '/*_iar.s') + Glob(comm + '/*.c')
env.Append(CPPPATH = [RTT_ROOT + '/libcpu/' + rtconfig.ARCH + '/' + rtconfig.CPU])
obj = env.Object(src_local) obj = env.Object(src_local)
Return('obj') Return('obj')

15
libcpu/arm/stm32/start_gcc.s
View File

@ -143,7 +143,7 @@ g_pfnVectors:
.word Initial_spTop .word Initial_spTop
.word Reset_Handler .word Reset_Handler
.word NMI_Handler .word NMI_Handler
.word HardFault_Handler .word rt_hw_hard_fault
.word MemManage_Handler .word MemManage_Handler
.word BusFault_Handler .word BusFault_Handler
.word UsageFault_Handler .word UsageFault_Handler
@ -154,8 +154,8 @@ g_pfnVectors:
.word SVC_Handler .word SVC_Handler
.word DebugMon_Handler .word DebugMon_Handler
.word 0 .word 0
.word PendSV_Handler .word rt_hw_pend_sv
.word SysTick_Handler .word rt_hw_timer_handler
.word WWDG_IRQHandler .word WWDG_IRQHandler
.word PVD_IRQHandler .word PVD_IRQHandler
.word TAMPER_IRQHandler .word TAMPER_IRQHandler
@ -274,9 +274,6 @@ g_pfnVectors:
.weak NMI_Handler .weak NMI_Handler
.thumb_set NMI_Handler,Default_Handler .thumb_set NMI_Handler,Default_Handler
.weak HardFault_Handler
.thumb_set HardFault_Handler,Default_Handler
.weak MemManage_Handler .weak MemManage_Handler
.thumb_set MemManage_Handler,Default_Handler .thumb_set MemManage_Handler,Default_Handler
@ -292,12 +289,6 @@ g_pfnVectors:
.weak DebugMon_Handler .weak DebugMon_Handler
.thumb_set DebugMon_Handler,Default_Handler .thumb_set DebugMon_Handler,Default_Handler
.weak PendSV_Handler
.thumb_set PendSV_Handler,Default_Handler
.weak SysTick_Handler
.thumb_set SysTick_Handler,Default_Handler
.weak WWDG_IRQHandler .weak WWDG_IRQHandler
.thumb_set WWDG_IRQHandler,Default_Handler .thumb_set WWDG_IRQHandler,Default_Handler

1
net/lwip/SConscript
View File

@ -62,7 +62,6 @@ src/netif/ppp/vj.c
# The set of source files associated with this SConscript file. # The set of source files associated with this SConscript file.
path = [RTT_ROOT + '/net/lwip/src', RTT_ROOT + '/net/lwip/src/include', RTT_ROOT + '/net/lwip/src/include/ipv4', RTT_ROOT + '/net/lwip/src/arch/include', RTT_ROOT + '/net/lwip/src/include/netif', RTT_ROOT + '/net/lwip/src/netif/ppp'] path = [RTT_ROOT + '/net/lwip/src', RTT_ROOT + '/net/lwip/src/include', RTT_ROOT + '/net/lwip/src/include/ipv4', RTT_ROOT + '/net/lwip/src/arch/include', RTT_ROOT + '/net/lwip/src/include/netif', RTT_ROOT + '/net/lwip/src/netif/ppp']
env.Clone()
env.Append(CPPPATH = path) env.Append(CPPPATH = path)
obj = env.Object(src_local) obj = env.Object(src_local)

3
src/SConscript
View File

@ -1,7 +1,10 @@
Import('env') Import('env')
Import('RTT_ROOT')
# The set of source files associated with this SConscript file. # The set of source files associated with this SConscript file.
src_local = Glob('*.c') src_local = Glob('*.c')
env.Append(CPPPATH = [RTT_ROOT + '/include'])
obj = env.Object(src_local) obj = env.Object(src_local)
Return('obj') Return('obj')