diff options
| author | Alexis211 <alexis211@gmail.com> | 2009-10-24 18:24:46 +0200 |
|---|---|---|
| committer | Alexis211 <alexis211@gmail.com> | 2009-10-24 18:24:46 +0200 |
| commit | b639b99b3e8f4cf77560d8d473b13d992ac8eb10 (patch) | |
| tree | 63ebeec75f4ab71d73d743afca04a98636dee165 /Source/Applications/SampleApps/Makefile | |
| parent | f62cfdc8ff6297616d68f6b195db7abc82ab457b (diff) | |
| download | Melon-b639b99b3e8f4cf77560d8d473b13d992ac8eb10.tar.gz Melon-b639b99b3e8f4cf77560d8d473b13d992ac8eb10.zip | |
More work on userland syscalls : Files are implemented.
TextFile now is a common (= kernel and userland) library.
Diffstat (limited to 'Source/Applications/SampleApps/Makefile')
| -rw-r--r-- | Source/Applications/SampleApps/Makefile | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/Source/Applications/SampleApps/Makefile b/Source/Applications/SampleApps/Makefile index a632f87..05f79b1 100644 --- a/Source/Applications/SampleApps/Makefile +++ b/Source/Applications/SampleApps/Makefile @@ -1,13 +1,13 @@ .PHONY: clean, mrproper ASM = nasm -ASMFLAGS = -f elf +ASMFLAGS = -f bin CXX = g++ -CXXFLAGS = -nostartfiles -nostdlib -fno-exceptions -fno-rtti -I ../../Library/Common -I ../../Library/Interface -I ../../Library/Userland -D THIS_IS_MELON_USERLAND +CXXFLAGS = -nostartfiles -nostdlib -ffreestanding -fno-exceptions -fno-rtti -I ../../Library/Common -I ../../Library/Interface -I ../../Library/Userland -D THIS_IS_MELON_USERLAND LD = ld -LDFLAGS = -T ../../Library/Link.ld +LDFLAGS = -T ../../Library/Link.ld -L ../../Library Applications = asmdemo cxxdemo @@ -20,13 +20,11 @@ rebuild: mrproper all echo "* Compiling $<..." $(CXX) $(CXXFLAGS) -c $< -o $@.o echo "* Linking $@.o..." - $(LD) $(LDFLAGS) ../../Library/Melon.o $@.o -o $@ + $(LD) $(LDFLAGS) $@.o -o $@ %: %.asm echo "* Compiling $<..." - $(ASM) $(ASMFLAGS) -o $@.o $< - echo "* Linking $@.o..." - $(LD) $(LDFLAGS) $@.o -o $@ + $(ASM) $(ASMFLAGS) -o $@ $< clean: echo "* Removing object files..." |