summaryrefslogtreecommitdiff
path: root/Source/Library/Makefile
diff options
context:
space:
mode:
authorAlexis211 <alexis211@gmail.com>2009-12-23 19:19:55 +0100
committerAlexis211 <alexis211@gmail.com>2009-12-23 19:19:55 +0100
commite2d5d79bbc90d73f709953f04b2b0d1faac4d43e (patch)
treebde6f928e3a45ef66f4056cbc932bc21fe44cb31 /Source/Library/Makefile
parent7ede286ebcb845fe4bfdfb948c6073573b01c3cb (diff)
downloadMelon-e2d5d79bbc90d73f709953f04b2b0d1faac4d43e.tar.gz
Melon-e2d5d79bbc90d73f709953f04b2b0d1faac4d43e.zip
Changed the way virtual terminal commands are handled
These commands include those for moving the cursor, showing/hiding it, changing the color, ...
Diffstat (limited to 'Source/Library/Makefile')
-rw-r--r--Source/Library/Makefile10
1 files changed, 4 insertions, 6 deletions
diff --git a/Source/Library/Makefile b/Source/Library/Makefile
index c67daf7..6e3e269 100644
--- a/Source/Library/Makefile
+++ b/Source/Library/Makefile
@@ -6,10 +6,8 @@ CXXFLAGS = -nostartfiles -nostdlib -ffreestanding -fno-exceptions -fno-rtti -I C
ASM = nasm
ASMFLAGS = -f elf
-LDFLAGS = -r
LD = ld
-Library = Melon.o
Objects = Common/WChar.class.uo \
Common/CMem.ns.uo \
Common/Mutex.class.uo \
@@ -30,14 +28,14 @@ Objects = Common/WChar.class.uo \
Userland/Syscall/RessourceCaller.class.uo \
Userland/Start.uo
-all: $(Library)
+all: libMelon.o
echo "* Done with library"
rebuild: mrproper all
-$(Library): $(Objects)
- echo "* Linking melon library $(Library)..."
- $(LD) $(LDFLAGS) $^ -o $@
+libMelon.o: $(Objects)
+ echo "* Linking static Melon library libMelon.o..."
+ $(LD) -r $^ -o $@
%.uo: %.cpp
echo "* Compiling $<..."