summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMichal Idziorek <m.i@gmx.at>2014-08-30 01:21:56 +0200
committerMichal Idziorek <m.i@gmx.at>2014-08-30 01:21:56 +0200
commit0ba95e7cdbfc7e9833e8c46b02e2248783ff6a5d (patch)
tree68602e52ad69cb433b9bf81e401128ebc738cbad /Makefile
parent47d22a238a6c5d60c6abfac724e6ad91885cdd67 (diff)
preparing for multitasking
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile7
1 files changed, 6 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 653b9e9..b633722 100644
--- a/Makefile
+++ b/Makefile
@@ -43,6 +43,11 @@ mbr.bin: boot/mbr.asm
kernel_entry.o: boot/kernel_entry.asm
nasm -f elf $^ -o $@
+read_eip.o: asm/read_eip.asm
+ nasm -f elf $^ -o $@
+
+copy_page_physical.o: asm/copy_page_physical.asm
+ nasm -f elf $^ -o $@
kernel.o: kernel/kernel.c kernel/console.h
gcc -ffreestanding -std=gnu99 -m32 -o $@ -c $< -fno-asynchronous-unwind-tables -O0
@@ -89,7 +94,7 @@ log.o: lib/logger/log.c
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
+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 read_eip.o copy_page_physical.o
ld -o $@ -Ttext 0x1000 --oformat binary -melf_i386 $^ -O0
# dump from vbox