diff options
| author | Galen Sagarin <gps5307@rit.edu> | 2025-04-29 14:18:40 -0400 |
|---|---|---|
| committer | Galen Sagarin <gps5307@rit.edu> | 2025-04-29 14:18:40 -0400 |
| commit | ae2cdd83ba4a0cae161db0b29031d5591005fa34 (patch) | |
| tree | 82fbdfcbb1fe4e3b5e232db195c8c331d69489fd /Makefile | |
| parent | Started writing fat.c (diff) | |
| parent | fs header changes (diff) | |
| download | comus-ae2cdd83ba4a0cae161db0b29031d5591005fa34.tar.gz comus-ae2cdd83ba4a0cae161db0b29031d5591005fa34.tar.bz2 comus-ae2cdd83ba4a0cae161db0b29031d5591005fa34.zip | |
Merge branch 'main' of https://github.com/kenshineto/kern into fat32
Merging main into here
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -15,7 +15,7 @@ CFLAGS += -std=c11 CFLAGS += -Wall -Wextra -pedantic CFLAGS += -fno-pie -fno-stack-protector CFLAGS += -fno-omit-frame-pointer -ffreestanding -CFLAGS += -fno-builtin +CFLAGS += -nostdlib -fno-builtin -mno-red-zone CFLAGS += -D DEBUG -g CFLAGS += $(CPPFLAGS) @@ -40,7 +40,7 @@ UNAME := $(shell uname) QEMU = qemu-system-x86_64 QEMUOPTS = -cdrom $(BIN)/$(ISO) \ -no-reboot \ - -drive format=raw,file=$(BIN)/$(IMAGE)\ + -drive format=raw,file=$(BIN)/user/apple\ -serial mon:stdio \ -m 4G \ -name kern @@ -76,7 +76,8 @@ gdb: clean: rm -fr $(BIN) -build: $(BIN)/$(ISO) +build: $(BIN)/$(KERNEL) + make -s -C user $(A_OBJ): $(BIN)/%.S.o : %.S $(H_SRC) mkdir -p $(@D) @@ -100,8 +101,7 @@ $(BIN)/$(ISO): $(BIN)/$(KERNEL) cp $(BIN)/$(KERNEL) $(BIN)/iso/boot $(GRUB) -o $(BIN)/$(ISO) bin/iso 2>/dev/null -$(BIN)/$(IMAGE): - make -s -C user +$(BIN)/$(IMAGE): build qemu-img create $(BIN)/$(IMAGE) $(IMAGE_SIZE) fmt: |