From f60d40f3bf4dfe8ed6f63a27367d323319a4ef97 Mon Sep 17 00:00:00 2001 From: dzwdz Date: Fri, 25 Jun 2021 16:22:43 +0200 Subject: ring3 --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Makefile') 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 -- cgit v1.2.3