mirror of
https://github.com/RT-Thread/rt-thread.git
synced 2025-02-28 06:27:06 +08:00
Merge pull request #919 from aozima/pulls
update SConscript: support scons 3.
This commit is contained in:
commit
892bfd71f4
@ -16,9 +16,9 @@ if rtconfig.CROSS_TOOL == 'gcc':
|
|||||||
elif rtconfig.CROSS_TOOL == 'keil':
|
elif rtconfig.CROSS_TOOL == 'keil':
|
||||||
src += ['CME_M7/startup/arm/startup_cmem7.s']
|
src += ['CME_M7/startup/arm/startup_cmem7.s']
|
||||||
elif rtconfig.CROSS_TOOL == 'iar':
|
elif rtconfig.CROSS_TOOL == 'iar':
|
||||||
print '================ERROR============================'
|
print('================ERROR============================')
|
||||||
print 'Not support IAR yet!'
|
print('Not support IAR yet!')
|
||||||
print '================================================='
|
print('=================================================')
|
||||||
exit(0)
|
exit(0)
|
||||||
|
|
||||||
path = [cwd + '/CME_M7']
|
path = [cwd + '/CME_M7']
|
||||||
|
@ -11,9 +11,9 @@ src += [cwd + '/CMSIS/GD/GD32F4xx/Source/system_gd32f4xx.c']
|
|||||||
|
|
||||||
#add for startup script
|
#add for startup script
|
||||||
if rtconfig.CROSS_TOOL == 'gcc':
|
if rtconfig.CROSS_TOOL == 'gcc':
|
||||||
print '================================================='
|
print('=================================================')
|
||||||
print 'Not support gcc yet!'
|
print('Not support gcc yet!')
|
||||||
print '================================================='
|
print('=================================================')
|
||||||
exit(0)
|
exit(0)
|
||||||
elif rtconfig.CROSS_TOOL == 'keil':
|
elif rtconfig.CROSS_TOOL == 'keil':
|
||||||
src += [cwd + '/CMSIS/GD/GD32F4xx/Source/ARM/startup_gd32f4xx.s']
|
src += [cwd + '/CMSIS/GD/GD32F4xx/Source/ARM/startup_gd32f4xx.s']
|
||||||
|
@ -12,7 +12,7 @@ src += Glob('common/chip/*.c')
|
|||||||
|
|
||||||
# add for startup script
|
# add for startup script
|
||||||
if rtconfig.CROSS_TOOL == 'gcc':
|
if rtconfig.CROSS_TOOL == 'gcc':
|
||||||
print "not gcc startup file"
|
print("not gcc startup file")
|
||||||
exit(0)
|
exit(0)
|
||||||
elif rtconfig.CROSS_TOOL == 'keil':
|
elif rtconfig.CROSS_TOOL == 'keil':
|
||||||
src += [cwd + '/common/startup/keil_startup_lpc82x.s']
|
src += [cwd + '/common/startup/keil_startup_lpc82x.s']
|
||||||
|
6
components/external/cairo/SConscript
vendored
6
components/external/cairo/SConscript
vendored
@ -6,9 +6,9 @@ CAIRO_PATH = 'cairo-' + CAIRO_VERSION
|
|||||||
cwd = GetCurrentDir()
|
cwd = GetCurrentDir()
|
||||||
|
|
||||||
if GetDepend('RT_USING_CAIRO') and not os.path.exists(CAIRO_PATH):
|
if GetDepend('RT_USING_CAIRO') and not os.path.exists(CAIRO_PATH):
|
||||||
print '================ERROR============================'
|
print('================ERROR============================')
|
||||||
print 'Please get cairo dist and put them under cairo folder'
|
print('Please get cairo dist and put them under cairo folder')
|
||||||
print '================================================='
|
print('=================================================')
|
||||||
exit(0)
|
exit(0)
|
||||||
|
|
||||||
# source files
|
# source files
|
||||||
|
6
components/external/ftk/SConscript
vendored
6
components/external/ftk/SConscript
vendored
@ -8,9 +8,9 @@ if os.path.isfile(os.path.join(RTT_ROOT, 'components', 'external', 'ftk',
|
|||||||
objs = SConscript('ftk/src/os/rt-thread/SConscript')
|
objs = SConscript('ftk/src/os/rt-thread/SConscript')
|
||||||
else:
|
else:
|
||||||
if GetDepend('RT_USING_FTK'):
|
if GetDepend('RT_USING_FTK'):
|
||||||
print '================ERROR============================'
|
print('================ERROR============================')
|
||||||
print 'Please get ftk file and put them under ftk folder'
|
print('Please get ftk file and put them under ftk folder')
|
||||||
print '================================================='
|
print('=================================================')
|
||||||
exit(0)
|
exit(0)
|
||||||
|
|
||||||
objs = []
|
objs = []
|
||||||
|
6
components/external/pixman/SConscript
vendored
6
components/external/pixman/SConscript
vendored
@ -8,9 +8,9 @@ PIXMAN_VERSION = '0.21.6'
|
|||||||
PIXMAN_PATH = 'pixman-' + PIXMAN_VERSION
|
PIXMAN_PATH = 'pixman-' + PIXMAN_VERSION
|
||||||
|
|
||||||
if GetDepend('RT_USING_CAIRO') and not os.path.exists(PIXMAN_PATH):
|
if GetDepend('RT_USING_CAIRO') and not os.path.exists(PIXMAN_PATH):
|
||||||
print '================ERROR============================'
|
print('================ERROR============================')
|
||||||
print 'Please get pixman dist and put them under pixman folder'
|
print('Please get pixman dist and put them under pixman folder')
|
||||||
print '================================================='
|
print('=================================================')
|
||||||
exit(0)
|
exit(0)
|
||||||
|
|
||||||
# core source files
|
# core source files
|
||||||
|
Loading…
x
Reference in New Issue
Block a user