summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLizzy Fleckenstein <lizzy@vlhl.dev>2023-12-19 01:54:39 +0100
committerLizzy Fleckenstein <lizzy@vlhl.dev>2023-12-19 02:11:32 +0100
commit6d263c7d4e0f4b1d34694b5d3d159ccb20b3db02 (patch)
tree41578268cf68b2d9ea1737687a0f98af979948d8 /Makefile
parent5881b4d5c1040c762599f90e091e4cc4c3abe6b1 (diff)
downloadcuddles-6d263c7d4e0f4b1d34694b5d3d159ccb20b3db02.tar.xz
keyboard driver and threads
* PS/2 keyboard driver * interactive shell * move away from \0 terminated strings to sized slices * coroutine threads and IRQ queues
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
1 files changed, 6 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index e02f94c..cf4bd3d 100644
--- a/Makefile
+++ b/Makefile
@@ -28,7 +28,11 @@ STAGE3 = \
stage3/ata.o \
stage3/string.o \
stage3/pci.o \
- stage3/fs.o
+ stage3/fs.o \
+ stage3/yield.o \
+ stage3/ps2.o \
+ stage3/thread.o \
+ stage3/shell.o
PAD_BOUNDARY = pad() { truncate -s $$(echo "($$(du -b $$1 | cut -f1)+$$2-1)/$$2*$$2" | bc) $$1; }; pad
@@ -52,7 +56,7 @@ stage3/%.o: stage3/%.asm
nasm -f elf64 $< -o $@
stage3/%.o: stage3/%.c
- cc $(CFLAGS) -c $< -o $@
+ gcc $(CFLAGS) -c $< -o $@
stage3/isr.asm: stage3/isr.lua
lua stage3/isr.lua > stage3/isr.asm