diff options
| author | Alexis211 <alexis211@gmail.com> | 2009-12-22 15:03:48 +0100 |
|---|---|---|
| committer | Alexis211 <alexis211@gmail.com> | 2009-12-22 15:03:48 +0100 |
| commit | 2c23da1cf398aef420130dde1b86e4c474e3cacb (patch) | |
| tree | 33f31cf7459fe017c35a313c88e4bfcb6f00eb8a /Source/Kernel/Makefile | |
| parent | 98decfffefc49c82f20a0453cef823f7588e7654 (diff) | |
| parent | 837290db7d39c8cd852541cb345dc5a57c9274ce (diff) | |
| download | Melon-2c23da1cf398aef420130dde1b86e4c474e3cacb.tar.gz Melon-2c23da1cf398aef420130dde1b86e4c474e3cacb.zip | |
Merge branch 'master' into framework
Conflicts:
Melon.img
Diffstat (limited to 'Source/Kernel/Makefile')
| -rw-r--r-- | Source/Kernel/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Source/Kernel/Makefile b/Source/Kernel/Makefile index 0f244d5..6a44ecf 100644 --- a/Source/Kernel/Makefile +++ b/Source/Kernel/Makefile @@ -14,6 +14,7 @@ Objects = Core/loader.wtf.o \ Core/kmain.wtf.o \ Core/Sys.ns.o \ Core/Log.ns.o \ + Core/SB.ns.o \ MemoryManager/Mem.ns.o \ MemoryManager/PhysMem.ns.o \ MemoryManager/GDT.wtf.o \ |