diff options
| author | Alexis211 <alexis211@gmail.com> | 2009-10-18 18:39:52 +0200 |
|---|---|---|
| committer | Alexis211 <alexis211@gmail.com> | 2009-10-18 18:39:52 +0200 |
| commit | ccf807eb4ff541bb849c4f370d34123cb23d7d76 (patch) | |
| tree | 7f97fcf3f83ef1efcdc0ae72e11aab1f8332a667 /Source/Library/Makefile | |
| parent | eb7b832d47bcbd74181028c62e871d407ba63a23 (diff) | |
| download | Melon-ccf807eb4ff541bb849c4f370d34123cb23d7d76.tar.gz Melon-ccf807eb4ff541bb849c4f370d34123cb23d7d76.zip | |
Heap included as well in userland library
Diffstat (limited to 'Source/Library/Makefile')
| -rw-r--r-- | Source/Library/Makefile | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/Source/Library/Makefile b/Source/Library/Makefile index b9be0a0..028e7a4 100644 --- a/Source/Library/Makefile +++ b/Source/Library/Makefile @@ -1,7 +1,10 @@ .PHONY: clean, mrproper CXX = g++ -CXXFLAGS = -nostartfiles -nostdlib -fno-exceptions -fno-rtti -I Common -I Userland -D THIS_IS_MELON_USERLAND +CXXFLAGS = -nostartfiles -nostdlib -fno-exceptions -fno-rtti -I Common -I Userland -I Interface -D THIS_IS_MELON_USERLAND + +ASM = nasm +ASMFLAGS = -f elf LDFLAGS = -r LD = ld @@ -9,6 +12,9 @@ LD = ld Library = Melon.o Objects = Common/WChar.class.uo \ Common/CMem.ns.uo \ + Common/Mutex.class.uo \ + Common/Heap.class.uo \ + Common/Heap-index.class.uo \ Userland/Syscall/Syscall.wtf.uo \ Userland/Syscall/RessourceCaller.class.uo \ Userland/Start.uo @@ -26,6 +32,10 @@ $(Library): $(Objects) echo "* Compiling $<..." $(CXX) $(CXXFLAGS) -c $< -o $@ +%.uo: %.asm + echo "* Compiling $<..." + $(ASM) $(ASMFLAGS) $< -o $@ + clean: echo "* Removing object files..." rm -rf $(Objects) |