From efeb6231bee9822338f7ea21a7de804ca56681ee Mon Sep 17 00:00:00 2001 From: "dzzxzz@gmail.com" Date: Mon, 18 Jun 2012 03:00:01 +0000 Subject: define RT_USING_RTT_CMSIS in rtconfig.h while using IAR 6.30+ git-svn-id: https://rt-thread.googlecode.com/svn/trunk@2170 bbd45198-f89e-11dd-88c7-29a3b14d5316 --- bsp/stm32f10x/Libraries/SConscript | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'bsp/stm32f10x/Libraries/SConscript') diff --git a/bsp/stm32f10x/Libraries/SConscript b/bsp/stm32f10x/Libraries/SConscript index 44b213e685..1b5fe11170 100644 --- a/bsp/stm32f10x/Libraries/SConscript +++ b/bsp/stm32f10x/Libraries/SConscript @@ -7,7 +7,6 @@ cwd = GetCurrentDir() # The set of source files associated with this SConscript file. src = Split(""" -CMSIS/CM3/CoreSupport/core_cm3.c CMSIS/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.c STM32F10x_StdPeriph_Driver/src/stm32f10x_crc.c STM32F10x_StdPeriph_Driver/src/stm32f10x_rcc.c @@ -54,9 +53,14 @@ elif rtconfig.CROSS_TOOL == 'iar': src = src + ['CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/' + startup_scripts[rtconfig.STM32_TYPE]] path = [cwd + '/STM32F10x_StdPeriph_Driver/inc', - cwd + '/CMSIS/CM3/CoreSupport', cwd + '/CMSIS/CM3/DeviceSupport/ST/STM32F10x'] +if GetDepend(['RT_USING_BSP_CMSIS']): + path += [cwd + '/CMSIS/CM3/CoreSupport'] + src += [cwd + '/CMSIS/CM3/CoreSupport/core_cm3.c'] +elif GetDepend(['RT_USING_RTT_CMSIS']): + path += [RTT_ROOT + '/components/CMSIS/Include'] + CPPDEFINES = ['USE_STDPERIPH_DRIVER', rtconfig.STM32_TYPE] group = DefineGroup('STM32_StdPeriph', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) -- cgit v1.3.1