summaryrefslogtreecommitdiff
path: root/src/Makefile
diff options
context:
space:
mode:
authorAndreas Baumann <mail@andreasbaumann.cc>2017-07-02 21:39:09 +0200
committerAndreas Baumann <mail@andreasbaumann.cc>2017-07-02 21:39:09 +0200
commite6efe69c614d7781d18a7189831e8243abf57664 (patch)
tree44292f2913f52bee038b7c27c1551c3e6ed755f1 /src/Makefile
parent2c8aa7c2fa92aabf5ac277606fba1e6b5c6b3ed9 (diff)
downloadabaos-e6efe69c614d7781d18a7189831e8243abf57664.tar.gz
abaos-e6efe69c614d7781d18a7189831e8243abf57664.tar.bz2
started to add task scheduling
Diffstat (limited to 'src/Makefile')
-rw-r--r--src/Makefile6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/Makefile b/src/Makefile
index bcb0da7..c256605 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -33,10 +33,11 @@ kernel.bin: kernel.elf
kernel.sym: kernel.elf
$(OBJCOPY) --only-keep-debug kernel.elf kernel.sym
-kernel.elf: kernel/kernel.o kernel/kernel_asm.o kernel/console.o kernel/vgatext.o kernel/serial.o hardware/port.o hardware/port_asm.o hardware/interrupts.o hardware/interrupts_asm.o hardware/pci.o drivers/driver.o drivers/hdi/ps2/keyboard.o drivers/hdi/ps2/mouse.o drivers/video/vga.o drivers/video/vga_font.o gui/widget.o gui/composite_widget.o gui/window.o gui/desktop.o gui/text_widget.o libc/string.o libc/stdlib.o libc/stdio.o libc/setjmp.o
+kernel.elf: kernel/kernel.o kernel/kernel_asm.o kernel/console.o kernel/vgatext.o kernel/serial.o kernel/tasks.o hardware/port.o hardware/port_asm.o hardware/interrupts.o hardware/interrupts_asm.o hardware/pci.o drivers/driver.o drivers/hdi/ps2/keyboard.o drivers/hdi/ps2/mouse.o drivers/video/vga.o drivers/video/vga_font.o gui/widget.o gui/composite_widget.o gui/window.o gui/desktop.o gui/text_widget.o libc/string.o libc/stdlib.o libc/stdio.o libc/setjmp.o
$(LD) -o kernel.elf -N -n -Ttext 0x8800 --oformat elf32-i386 \
kernel/kernel.o kernel/kernel_asm.o \
kernel/console.o kernel/vgatext.o kernel/serial.o \
+ kernel/tasks.o \
hardware/port.o hardware/port_asm.o \
hardware/interrupts.o hardware/interrupts_asm.o \
hardware/pci.o \
@@ -71,6 +72,9 @@ kernel/vgatext.o: kernel/vgatext.c kernel/vgatext.h
kernel/serial.o: kernel/serial.c kernel/serial.h
$(CC) $(CFLAGS) -c -o kernel/serial.o kernel/serial.c
+kernel/tasks.o: kernel/tasks.c kernel/tasks.h
+ $(CC) $(CFLAGS) -c -o kernel/tasks.o kernel/tasks.c
+
hardware/interrupts.o: hardware/interrupts.c hardware/interrupts.h
$(CC) $(CFLAGS) -c -o hardware/interrupts.o hardware/interrupts.c