diff options
author | Ian McFarlane <i.mcfarlane2002@gmail.com> | 2025-04-22 14:51:47 -0400 |
---|---|---|
committer | Ian McFarlane <i.mcfarlane2002@gmail.com> | 2025-04-22 14:51:47 -0400 |
commit | 325e2ea9aef0723645b86bdc773f02293747c495 (patch) | |
tree | 2d844c3e30a27eaf463fed851620221f3ad7d540 /Makefile | |
parent | try to find mcfg (diff) | |
parent | force rebuild on header change (diff) | |
download | comus-325e2ea9aef0723645b86bdc773f02293747c495.tar.gz comus-325e2ea9aef0723645b86bdc773f02293747c495.tar.bz2 comus-325e2ea9aef0723645b86bdc773f02293747c495.zip |
Merge branch 'main' into pciepcie
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -78,13 +78,13 @@ clean: build: $(BIN)/$(ISO) -$(A_OBJ): $(BIN)/%.S.o : %.S +$(A_OBJ): $(BIN)/%.S.o : %.S $(H_SRC) mkdir -p $(@D) printf "\033[33m AS \033[0m%s\n" $< $(CPP) $(CPPFLAGS) -o $@.cpp $< $(AS) -o $@ $@.cpp -$(C_OBJ): $(BIN)/%.o : %.c +$(C_OBJ): $(BIN)/%.o : %.c $(H_SRC) mkdir -p $(@D) printf "\033[34m CC \033[0m%s\n" $< $(CC) -c $(CFLAGS) -o $@ $< @@ -101,6 +101,7 @@ $(BIN)/$(ISO): $(BIN)/$(KERNEL) $(GRUB) -o $(BIN)/$(ISO) bin/iso 2>/dev/null $(BIN)/$(IMAGE): + make -s -C user qemu-img create $(BIN)/$(IMAGE) $(IMAGE_SIZE) fmt: |