From 9b856ae4d7ad3dafc5cc6eac9194ff3803965d94 Mon Sep 17 00:00:00 2001
From: manzerbredes <loic.guegan_secondary@yahoo.fr>
Date: Mon, 20 Jul 2015 16:34:46 +0400
Subject: Switch to cpp

---
 kernel/Makefile | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'kernel/Makefile')

diff --git a/kernel/Makefile b/kernel/Makefile
index 8b0c1bf..c366b55 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -1,12 +1,15 @@
 
-kernel.bin:entry.o main.o
+kernel.bin:entry.o main.o GDT/gdt.o
 	ld -m elf_i386 --entry=_start -Ttext=0x100000 -o $@ $^
 
 entry.o:entry.asm
 	nasm -f elf $^
-main.o:main.c
-	gcc -m32 -c $^ -o $@
+main.o:main.cpp
+	g++ -Wall -m32 -c $^ -o $@
+GDT/gdt.o:
+	cd GDT && make
 
 clean:
+	cd ./GDT/ && make clean
 	rm ./*.o
-	rm kernel.bin
+	rm ./kernel.bin
-- 
cgit v1.2.3