diff options
| author | Bernard Xiong <[email protected]> | 2015-12-11 09:53:23 +0800 |
|---|---|---|
| committer | Bernard Xiong <[email protected]> | 2015-12-11 09:53:23 +0800 |
| commit | 74def7ed7293edbf7fb3042dd3190da6f263fca2 (patch) | |
| tree | bcb6e44aa4cba2267c9079ef936269e089c3ab0a | |
| parent | d2aee2539125e2910bdd06d7931ee66ffbc6359d (diff) | |
| parent | fc2467a190b06bbbca4f7348c6e952b6252c6660 (diff) | |
Merge pull request #596 from zhj2232006/master
fix issue #572, keil armcc compiling report "Error: expected an expression"
| -rw-r--r-- | bsp/stm32f10x/rtconfig.py | 1 | ||||
| -rw-r--r-- | bsp/stm32f10x/template.uvproj | 1 | ||||
| -rw-r--r-- | bsp/stm32f10x/template.uvprojx | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/bsp/stm32f10x/rtconfig.py b/bsp/stm32f10x/rtconfig.py index 20a843ba40..4ebbb68aab 100644 --- a/bsp/stm32f10x/rtconfig.py +++ b/bsp/stm32f10x/rtconfig.py @@ -79,6 +79,7 @@ elif PLATFORM == 'armcc': AFLAGS = DEVICE LFLAGS = DEVICE + ' --info sizes --info totals --info unused --info veneers --list rtthread-stm32.map --scatter stm32_rom.sct' + CFLAGS += ' --c99' CFLAGS += ' -I' + EXEC_PATH + '/ARM/RV31/INC' LFLAGS += ' --libpath ' + EXEC_PATH + '/ARM/RV31/LIB' diff --git a/bsp/stm32f10x/template.uvproj b/bsp/stm32f10x/template.uvproj index 9304eff62a..acb78f6902 100644 --- a/bsp/stm32f10x/template.uvproj +++ b/bsp/stm32f10x/template.uvproj @@ -347,6 +347,7 @@ <wLevel>0</wLevel> <uThumb>0</uThumb> <uSurpInc>0</uSurpInc> + <uC99>1</uC99> <VariousControls> <MiscControls></MiscControls> <Define></Define> diff --git a/bsp/stm32f10x/template.uvprojx b/bsp/stm32f10x/template.uvprojx index c6aff7241a..0d439a6b71 100644 --- a/bsp/stm32f10x/template.uvprojx +++ b/bsp/stm32f10x/template.uvprojx @@ -350,6 +350,7 @@ <wLevel>0</wLevel> <uThumb>0</uThumb> <uSurpInc>0</uSurpInc> + <uC99>1</uC99> <VariousControls> <MiscControls></MiscControls> <Define></Define> |