diff options
| author | manzerbredes <loic.guegan_secondary@yahoo.fr> | 2015-07-20 16:34:46 +0400 |
|---|---|---|
| committer | manzerbredes <loic.guegan_secondary@yahoo.fr> | 2015-07-20 16:34:46 +0400 |
| commit | 9b856ae4d7ad3dafc5cc6eac9194ff3803965d94 (patch) | |
| tree | a2ed8285af123c8276c6acfcda41e8d0888d7632 /kernel/Makefile | |
| parent | 78f219c0ec049a08312896fdb1194ce03a54769a (diff) | |
Switch to cpp
Diffstat (limited to 'kernel/Makefile')
| -rw-r--r-- | kernel/Makefile | 11 |
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 |