mirror of
https://github.com/drasko/codezero.git
synced 2026-02-27 17:23:13 +01:00
Merge branch 'master' of git://www.b-labs.co.uk/amit/git/codezero into amit
Conflicts: conts/posix/mm0/mm/task.c
This commit is contained in:
@@ -34,8 +34,8 @@ LIBC_INCLUDE = [join(LIBC_DIR, 'include'), \
|
||||
|
||||
LIBDEV_RELDIR = 'conts/libdev'
|
||||
LIBDEV_DIR = join(PROJROOT, LIBDEV_RELDIR)
|
||||
LIBDEV_LIBPATH = join(BUILDDIR, LIBDEV_RELDIR)
|
||||
LIBDEV_INCLUDE = [join(LIBDEV_DIR, 'uart/include')]
|
||||
LIBDEV_LIBPATH = join(join(BUILDDIR, LIBDEV_RELDIR), 'sys-userspace')
|
||||
LIBDEV_INCLUDE = join(LIBDEV_DIR, 'uart/include')
|
||||
|
||||
LIBMEM_RELDIR = 'conts/libmem'
|
||||
LIBMEM_DIR = join(PROJROOT, LIBMEM_RELDIR)
|
||||
|
||||
Reference in New Issue
Block a user