From b639b99b3e8f4cf77560d8d473b13d992ac8eb10 Mon Sep 17 00:00:00 2001
From: Alexis211 <alexis211@gmail.com>
Date: Sat, 24 Oct 2009 18:24:46 +0200
Subject: More work on userland syscalls : Files are implemented.

TextFile now is a common (= kernel and userland) library.
---
 Source/Applications/SampleApps/Makefile | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'Source/Applications/SampleApps/Makefile')

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..."
-- 
cgit v1.2.3