Merge pull request #282 from ralfak/patch-4

Update SConscript
This commit is contained in:
Bernard Xiong 2014-05-22 22:31:24 +08:00
commit adbe1ea390
1 changed files with 1 additions and 12 deletions

View File

@ -12,16 +12,6 @@ CMSIS/ST/STM32F4xx/Source/Templates/system_stm32f4xx.c
src += Glob('STM32F4xx_StdPeriph_Driver/src/*.c')
# starupt scripts for each STM32 kind
# startup_scripts = {}
# startup_scripts['STM32F10X_CL'] = 'startup_stm32f10x_cl.s'
# startup_scripts['STM32F10X_HD'] = 'startup_stm32f10x_hd.s'
# startup_scripts['STM32F10X_HD_VL'] = 'startup_stm32f10x_hd_vl.s'
# startup_scripts['STM32F10X_LD'] = 'startup_stm32f10x_ld.s'
# startup_scripts['STM32F10X_LD_VL'] = 'startup_stm32f10x_ld_vl.s'
# startup_scripts['STM32F10X_MD'] = 'startup_stm32f10x_md.s'
# startup_scripts['STM32F10X_MD_VL'] = 'startup_stm32f10x_md_vl.s'
# startup_scripts['STM32F10X_XL'] = 'startup_stm32f10x_xl.s'
#add for startup script
if rtconfig.CROSS_TOOL == 'gcc':
@ -33,8 +23,7 @@ elif rtconfig.CROSS_TOOL == 'keil':
path = [cwd + '/STM32F4xx_StdPeriph_Driver/inc',
cwd + '/CMSIS/ST/STM32F4xx/Include',
cwd + '/CMSIS/Include',
cwd + '/CMSIS/CM3/DeviceSupport/ST/STM32F10x']
cwd + '/CMSIS/Include']
#CPPDEFINES = ['USE_STDPERIPH_DRIVER', rtconfig.STM32_TYPE]
CPPDEFINES = ['USE_STDPERIPH_DRIVER']