Merge branch 'master' of github.com:RT-Thread/rt-thread into sim-module
This commit is contained in:
commit
5923b4abc8
|
@ -134,13 +134,13 @@ def PrepareBuilding(env, root_directory, has_libcpu=False, remove_components = [
|
||||||
objs = SConscript('SConscript', variant_dir='build', duplicate=0)
|
objs = SConscript('SConscript', variant_dir='build', duplicate=0)
|
||||||
Repository(Rtt_Root)
|
Repository(Rtt_Root)
|
||||||
# include kernel
|
# include kernel
|
||||||
objs.append(SConscript(Rtt_Root + '/src/SConscript', variant_dir='build/src', duplicate=0))
|
objs.extend(SConscript(Rtt_Root + '/src/SConscript', variant_dir='build/src', duplicate=0))
|
||||||
# include libcpu
|
# include libcpu
|
||||||
if not has_libcpu:
|
if not has_libcpu:
|
||||||
objs.append(SConscript(Rtt_Root + '/libcpu/SConscript', variant_dir='build/libcpu', duplicate=0))
|
objs.extend(SConscript(Rtt_Root + '/libcpu/SConscript', variant_dir='build/libcpu', duplicate=0))
|
||||||
|
|
||||||
# include components
|
# include components
|
||||||
objs.append(SConscript(Rtt_Root + '/components/SConscript',
|
objs.extend(SConscript(Rtt_Root + '/components/SConscript',
|
||||||
variant_dir='build/components',
|
variant_dir='build/components',
|
||||||
duplicate=0,
|
duplicate=0,
|
||||||
exports='remove_components'))
|
exports='remove_components'))
|
||||||
|
|
Loading…
Reference in New Issue