aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJames Barnett <noreply@jamesbarnett.xyz>2019-05-25 20:11:52 +0100
committerJames Barnett <noreply@jamesbarnett.xyz>2019-05-25 20:11:52 +0100
commit506f1691f1ca7b562d82ab6f2280b87d0e4af84c (patch)
treebdb403c000cd15ab29cbce8b3bcec5077d6f9655 /Makefile
parentc1d948ce1973d9be37a43718f548776a0061807b (diff)
downloadtinyOS-506f1691f1ca7b562d82ab6f2280b87d0e4af84c.tar.xz
tinyOS-506f1691f1ca7b562d82ab6f2280b87d0e4af84c.zip
Add keyboard support
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 76fe6e1..57d03f1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,16 +1,18 @@
CC = gcc
-CFLAGS = -m32 -std=c99
+CFLAGS = -m32 -std=c99 -fno-stack-protector
default: build
setup:
mkdir -p bin
-build: setup kernel/kernel.c kernel/io/vga/text_mode_display.c kernel/kernel-bootstrap.asm
+build: setup kernel/kernel.c kernel/global_descriptor_table.c kernel/io/vga/text_mode_display.c kernel/io/keyboard/keyboard_handler.c kernel/kernel-bootstrap.asm
nasm -f elf32 kernel/kernel-bootstrap.asm -o bin/kernel-bootstrap.o
$(CC) $(CFLAGS) -c kernel/kernel.c -o bin/kernel.o
+ $(CC) $(CFLAGS) -c kernel/global_descriptor_table.c -o bin/global_descriptor_table.o
$(CC) $(CFLAGS) -c kernel/io/vga/text_mode_display.c -o bin/text_mode_display.o
+ $(CC) $(CFLAGS) -c kernel/io/keyboard/keyboard_handler.c -o bin/keyboard_handler.o
ld -m elf_i386 -T link.ld -o bin/kernel.bin bin/*.o
clean: