未验证 提交 f54c8bab 编写于 作者: B Bernard Xiong 提交者: GitHub

Merge pull request #1161 from zhaojuntao/Fix-IAR-Version-Problem

Fix-IAR-Version-Problem
...@@ -7,9 +7,7 @@ src = Glob('*.c') ...@@ -7,9 +7,7 @@ src = Glob('*.c')
CPPPATH = [cwd, str(Dir('#'))] CPPPATH = [cwd, str(Dir('#'))]
# add for startup script # add for startup script
if rtconfig.CROSS_TOOL == 'iar': if rtconfig.CROSS_TOOL == 'gcc':
CPPDEFINES = ['_TIMESPEC_DEFINED']
elif rtconfig.CROSS_TOOL == 'gcc':
CPPDEFINES = ['__START=entry'] CPPDEFINES = ['__START=entry']
else: else:
CPPDEFINES = [] CPPDEFINES = []
......
...@@ -6,12 +6,6 @@ cwd = os.path.join(str(Dir('#')), 'applications') ...@@ -6,12 +6,6 @@ cwd = os.path.join(str(Dir('#')), 'applications')
src = Glob('*.c') src = Glob('*.c')
CPPPATH = [cwd, str(Dir('#'))] CPPPATH = [cwd, str(Dir('#'))]
# add for startup script group = DefineGroup('Applications', src, depend = [''], CPPPATH = CPPPATH)
if rtconfig.CROSS_TOOL == 'iar':
CPPDEFINES = ['_TIMESPEC_DEFINED']
else:
CPPDEFINES = []
group = DefineGroup('Applications', src, depend = [''], CPPPATH = CPPPATH, CPPDEFINES=CPPDEFINES)
Return('group') Return('group')
...@@ -8,16 +8,10 @@ application.c ...@@ -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')
...@@ -20,6 +20,10 @@ struct timeval { ...@@ -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
/* /*
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册