summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authordzwdz2021-06-25 16:22:43 +0200
committerdzwdz2021-06-25 16:22:43 +0200
commitf60d40f3bf4dfe8ed6f63a27367d323319a4ef97 (patch)
tree1cde54eb600106d0d1fc11927f55d5a03eb2b4aa /Makefile
parent376325d08388d9103ca2f57aceb60c4a507a42aa (diff)
ring3
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index a1f9899..605b112 100644
--- a/Makefile
+++ b/Makefile
@@ -3,9 +3,9 @@ CC = i686-elf-gcc
CFLAGS = -std=gnu99 -ffreestanding -O2 -Wall -Wextra
CFLAGS += -I.
LFLAGS = -ffreestanding -O2 -nostdlib -lgcc
-QFLAGS = -no-reboot -d guest_errors
+QFLAGS = -no-reboot -d guest_errors,int,pcall,cpu_reset
-OBJ = platform/boot.o
+OBJ = $(patsubst %.s,%.o,$(wildcard platform/*.s))
OBJ += $(patsubst %.c,%.o,$(wildcard kernel/*.c))
@@ -27,7 +27,7 @@ kernel.bin: $(OBJ)
$(CC) $(LFLAGS) -T linker.ld $^ -o $@
grub-file --is-x86-multiboot $@
-platform/boot.o: platform/boot.s
+platform/%.o: platform/%.s
$(AS) $^ -o $@
%.o: %.c