diff --git a/bsp/ra6m4-cpk/SConscript b/bsp/ra6m4-cpk/SConscript index fe0ae941ae..6c129cbc40 100644 --- a/bsp/ra6m4-cpk/SConscript +++ b/bsp/ra6m4-cpk/SConscript @@ -1,14 +1,26 @@ # for module compiling import os Import('RTT_ROOT') +Import('rtconfig') +from building import * -cwd = str(Dir('#')) -objs = [] +cwd = GetCurrentDir() +src = [] +CPPPATH = [] list = os.listdir(cwd) +if rtconfig.CROSS_TOOL == 'iar': + print("\nThe current project does not support iar build\n") + Return('group') +elif rtconfig.CROSS_TOOL == 'gcc': + CPPPATH = [cwd] + src = Glob('./src/*.c') + +group = DefineGroup('Applications', src, depend = [''], CPPPATH = CPPPATH) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): - objs = objs + SConscript(os.path.join(d, 'SConscript')) + group = group + SConscript(os.path.join(d, 'SConscript')) -Return('objs') +Return('group') diff --git a/bsp/ra6m4-cpk/src/SConscript b/bsp/ra6m4-cpk/src/SConscript deleted file mode 100644 index 3b82975eb6..0000000000 --- a/bsp/ra6m4-cpk/src/SConscript +++ /dev/null @@ -1,17 +0,0 @@ -Import('RTT_ROOT') -Import('rtconfig') -from building import * - -cwd = GetCurrentDir() -src = [] -CPPPATH = [] - -if rtconfig.CROSS_TOOL == 'iar': - print("\nThe current project does not support iar build\n") - Return('group') -elif rtconfig.CROSS_TOOL == 'gcc': - CPPPATH = [cwd, ] - src = Glob('*.c') - -group = DefineGroup('Applications', src, depend = [''], CPPPATH = CPPPATH) -Return('group')