chinky/rtt-f030
chinky/rtt-f030
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix-IAR-Version-Problem

Browse Source 
[dlib/sys/time.h] Fix iar version problem
[bsp/stm32f429-apollo/applications/SConscript] Remove CPPDEFINES
This commit is contained in:
MurphyZhao 2018-01-10 10:54:45 +08:00
parent 2d7fac37bd
commit c258ca794d
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bsp/stm32f429-apollo/applications/SConscript
View File

@ -8,16 +8,10 @@ application.c
startup.c startup.c
""") """)
# add for startup script
if rtconfig.CROSS_TOOL == 'iar':
CPPDEFINES = ['_TIMESPEC_DEFINED']
else:
CPPDEFINES = []
# add UI engine demo. # add UI engine demo.
if GetDepend('RT_USING_GUIENGINE'): if GetDepend('RT_USING_GUIENGINE'):
src += ['rtgui_demo.c'] src += ['rtgui_demo.c']
group = DefineGroup('Applications', src, depend = [''], CPPPATH = CPPPATH, CPPDEFINES=CPPDEFINES) group = DefineGroup('Applications', src, depend = [''], CPPPATH = CPPPATH)
Return('group') Return('group')

4
components/libc/compilers/dlib/sys/time.h
View File

@ -20,6 +20,10 @@ struct timeval {
}; };
#endif /* _TIMEVAL_DEFINED */ #endif /* _TIMEVAL_DEFINED */
#if defined ( __ICCARM__ ) && (__VER__ >= 8011002)
#define _TIMESPEC_DEFINED
#endif
#ifndef _TIMESPEC_DEFINED #ifndef _TIMESPEC_DEFINED
#define _TIMESPEC_DEFINED #define _TIMESPEC_DEFINED
/* /*