diff options
| author | thread-liu <[email protected]> | 2020-12-03 09:09:00 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-12-03 09:09:00 +0800 |
| commit | d97530e0ffc6e28a7a68f66dfcf775f02fc007e5 (patch) | |
| tree | 523fdc8c8b15b4c68501ec7f09b29c26954a51db /src/SConscript | |
| parent | 73391c60fb7b26c5c05188b065196eea75d63145 (diff) | |
| parent | df3d4b7bc9cab6dcc0aaf87cd32bd67bb1531036 (diff) | |
Merge branch 'master' into step4
Diffstat (limited to 'src/SConscript')
| -rw-r--r-- | src/SConscript | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/SConscript b/src/SConscript index 82c3b8aaf1..c3a7775d75 100644 --- a/src/SConscript +++ b/src/SConscript @@ -23,12 +23,17 @@ if GetDepend('RT_USING_MEMHEAP') == False: if GetDepend('RT_USING_MEMHEAP_AS_HEAP'): SrcRemove(src, ['mem.c']) +if GetDepend('RT_USING_USERHEAP'): + SrcRemove(src, ['mem.c', 'slab.c']) + if GetDepend('RT_USING_DEVICE') == False: SrcRemove(src, ['device.c']) if GetDepend('RT_USING_SMP') == False: SrcRemove(src, ['cpu.c']) -group = DefineGroup('Kernel', src, depend = [''], CPPPATH = CPPPATH) +CPPDEFINES = ['__RTTHREAD__'] + +group = DefineGroup('Kernel', src, depend = [''], CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES) Return('group') |