diff options
| author | dzwdz | 2021-07-16 16:09:10 +0200 |
|---|---|---|
| committer | dzwdz | 2021-07-16 16:09:10 +0200 |
| commit | 4c7b4a3d0f798f62775d16b47b8f192c2c2b5ef0 (patch) | |
| tree | 24841110ca073af284a9291d9abc6e2080986ebc /Makefile | |
| parent | 2c3de0bdb63f933fecf7cf717396a16a29e38e10 (diff) | |
`make boot` uses boot.iso / GRUB now
I'm going to implement the "initrd" soon, and it'll use multiboot
modules - I have no idea how to use them with the qemu -kernel thing,
and I have to support GRUB anyways, so I'm just going to use it instead.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -31,11 +31,11 @@ out/obj/%.c.o: src/%.c .PHONY: boot debug lint clean -boot: out/fs/boot/kernel.bin - qemu-system-i386 -kernel $< $(QFLAGS) -no-shutdown +boot: out/boot.iso + qemu-system-i386 $< $(QFLAGS) -no-shutdown -debug: out/fs/boot/kernel.bin - qemu-system-i386 -kernel $< $(QFLAGS) -s -S & +debug: out/boot.iso + qemu-system-i386 $< $(QFLAGS) -s -S & sleep 1 gdb |