From cbefa73a9059aac2ddcb40208e17bec8e61ce1c8 Mon Sep 17 00:00:00 2001 From: manzerbredes Date: Mon, 20 Jul 2015 17:18:27 +0400 Subject: Edit all Makefile --- kernel/Makefile | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'kernel/Makefile') diff --git a/kernel/Makefile b/kernel/Makefile index cb1a351..b323e6e 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -1,7 +1,12 @@ +CXX=g++ -Wall -m32 +EXEC=kernel.bin +export CXX + +all:$(EXEC) #----- Kernel ----- -kernel.bin:entry.o main.o GDT/gdt.o +$(EXEC):entry.o main.o GDT/gdt.o ld -m elf_i386 --entry=_start -Ttext=0x100000 -o $@ $^ #----------------- @@ -10,7 +15,7 @@ kernel.bin:entry.o main.o GDT/gdt.o entry.o:entry.asm nasm -f elf $^ main.o:main.cpp - g++ -Wall -m32 -c $^ -o $@ + $(CXX) -c $^ -o $@ #----------------------- @@ -24,4 +29,5 @@ GDT/gdt.o: clean: cd ./GDT/ && make clean rm ./*.o - rm ./kernel.bin + rm ./$(EXEC) +#----------------- -- cgit v1.2.3