From e0c565f7ff7620dca9dfc6c607f4798f5291c7bf Mon Sep 17 00:00:00 2001
From: manzerbredes <loic.guegan_secondary@yahoo.fr>
Date: Tue, 28 Jul 2015 14:19:00 +0400
Subject: Go back to C and adapt code

---
 kernel/Makefile | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

(limited to 'kernel/Makefile')

diff --git a/kernel/Makefile b/kernel/Makefile
index a5694c4..0c24011 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -1,21 +1,28 @@
-CXX=g++ -Wall -m32
+CC=gcc
+LD=ld -m elf_i386
+CFLAGS=-m32
+LDFLAGS=-m elf_i386 --entry=_kernelEntry -Ttext=0x100000
+
 EXEC=kernel.bin
 
-export CXX
+export CC
+export LD
+export CFLAGS
+export LDFLAGS
 
 all:$(EXEC)
 
 #----- Kernel -----
 $(EXEC):entry.o main.o GDT/gdt.o Helpers/helpers.o
-	$(CXX)  --entry=_kernelEntry -Ttext=0x100000 -o $@ $^
+	$(LD) $(LDFLAGS) -o $@ $^
 #-----------------
 
 
 #----- Entry & Main-----
 entry.o:entry.asm
 	nasm -f elf $^
-main.o:main.cpp
-	$(CXX) -c $^ -o $@
+main.o:main.c
+	$(CC) $(CFLAGS) -c $^ -o $@
 #-----------------------
 
 
@@ -29,6 +36,7 @@ Helpers/helpers.o:
 	cd ./Helpers/ && make
 #---------------
 
+
 #----- Other -----
 .PHONY:clean
 
-- 
cgit v1.2.3