diff options
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 11 |
1 files changed, 8 insertions, 3 deletions
@@ -5,6 +5,11 @@ UNAME := $(shell uname) +GRUB = grub-mkrescue +ifeq ($(UNAME), Darwin) + GRUB = x86_64-elf-grub-mkrescue +endif + QEMU = qemu-system-x86_64 QEMUOPTS = -cdrom bin/os.iso \ -no-reboot \ @@ -32,8 +37,8 @@ bin/os.iso: build mkdir -p bin/iso/boot/grub cp config/grub.cfg bin/iso/boot/grub cp bin/kernel bin/iso/boot - grub-mkrescue -o bin/os.iso bin/iso 2>/dev/null + $(GRUB) -o bin/os.iso bin/iso 2>/dev/null fmt: - clang-format -i $(shell find -type f -name "*.[ch]") - sed -i 's/[ \t]*$$//' $(shell find -type f -name "*.[chS]" -or -name "*.ld") + clang-format -i $(shell find -type f -name "*.[ch]" -and -not -path "./kernel/old/*") + sed -i 's/[ \t]*$$//' $(shell find -type f -name "*.[chS]" -and -not -path "./kernel/old/*") |