sambuc/codezero
1
0
Fork 0
mirror of https://github.com/drasko/codezero.git synced 2026-01-19 06:13:16 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://www.b-labs.co.uk/bora/git/codezero into bora

Browse Source 
Conflicts:
	config/cml/container_ruleset.template
	config/configuration.py
	conts/examples/example1/SConstruct
	conts/libl4thread/include/l4thread/thread.h
This commit is contained in:
Bahadir Balban
2009-11-19 14:41:07 +02:00
parent b6df4238b7 496fba81c8
commit 3f1045d66e
37 changed files with 604 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
SConstruct.userlibs
View File

@@ -49,6 +49,9 @@ libmm, libmc, libmalloc = SConscript('conts/libmem/SConscript', \
duplicate = 0, variant_dir = \
join(BUILDDIR, os.path.relpath('conts/libmem', PROJROOT)))
libl4thread = SConscript('conts/libl4thread/SConscript', \
exports = { 'env' : env }, duplicate = 0, \
variant_dir = join(BUILDDIR, os.path.relpath('conts/libl4thread', PROJROOT)))
Alias('libl4', libl4)
Alias('libdev', libdev)
@@ -56,3 +59,4 @@ Alias('libc', libc)
Alias('libmm', libmm)
Alias('libmc', libmc)
Alias('libmalloc', libmalloc)
Alias('libl4thread', libl4thread)