summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMichal Idziorek <m.i@gmx.at>2014-08-27 23:10:04 +0200
committerMichal Idziorek <m.i@gmx.at>2014-08-27 23:10:04 +0200
commit7aea8d20ec8816759c8439fc39d90579fc37e18b (patch)
treef59d354ea1ad128929e0e810da0fa78bab00537b /Makefile
parentd680d4c641c085e7a31d19fe2d01f528e96d2ced (diff)
cleanup and switched logging to vesa mode console!
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile10
1 files changed, 8 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index a512ddb..61d25ec 100644
--- a/Makefile
+++ b/Makefile
@@ -75,7 +75,7 @@ keyboard.o: kernel/keyboard.c
gcc -ffreestanding -m32 -o $@ -c $< -fno-asynchronous-unwind-tables -O0
vesa.o: kernel/vesa.c
- gcc -ffreestanding -m32 -o $@ -c $< -fno-asynchronous-unwind-tables -O0
+ gcc -ffreestanding -std=gnu99 -m32 -o $@ -c $< -fno-asynchronous-unwind-tables -O0
timer.o: kernel/timer.c
gcc -ffreestanding -m32 -o $@ -c $< -fno-asynchronous-unwind-tables -O0
@@ -83,7 +83,13 @@ timer.o: kernel/timer.c
shell.o: kernel/shell.c
gcc -ffreestanding -m32 -o $@ -c $< -fno-asynchronous-unwind-tables -O0
-kernel.bin: kernel_entry.o kernel.o console.o interrupts.o keyboard.o timer.o floppy.o x86.o shell.o mem.o vmem.o pci.o e1000.o vesa.o
+log.o: lib/logger/log.c
+ gcc -ffreestanding -m32 -o $@ -c $< -fno-asynchronous-unwind-tables -O0
+
+printf.o: lib/printf/printf.c
+ gcc -ffreestanding -m32 -o $@ -c $< -fno-asynchronous-unwind-tables -O0
+
+kernel.bin: kernel_entry.o kernel.o console.o interrupts.o keyboard.o timer.o floppy.o x86.o shell.o mem.o vmem.o pci.o e1000.o vesa.o log.o printf.o
ld -o $@ -Ttext 0x1000 --oformat binary -melf_i386 $^ -O0
#16bit bootloader!