summaryrefslogtreecommitdiff
path: root/kernel/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/Makefile')
-rw-r--r--kernel/Makefile11
1 files changed, 7 insertions, 4 deletions
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