summaryrefslogtreecommitdiff
path: root/kernel/Makefile
diff options
context:
space:
mode:
authormanzerbredes <loic.guegan_secondary@yahoo.fr>2015-07-28 14:19:00 +0400
committermanzerbredes <loic.guegan_secondary@yahoo.fr>2015-07-28 14:19:00 +0400
commite0c565f7ff7620dca9dfc6c607f4798f5291c7bf (patch)
treec18099687db0202e32ae47f4c991b895191f030e /kernel/Makefile
parentaac010a9e30e479968e277ebdaf41ad366a77098 (diff)
Go back to C and adapt codeHEADmasterdevelop
Diffstat (limited to 'kernel/Makefile')
-rw-r--r--kernel/Makefile18
1 files changed, 13 insertions, 5 deletions
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