From 25ae3ad4e8608c0285d4d2c31154630ab3256e0e Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Fri, 21 Jul 2017 20:44:45 -0600 Subject: [PATCH] Do not include kernel in bootloader --- mk/disk.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mk/disk.mk b/mk/disk.mk index ed926ba..f78bbab 100644 --- a/mk/disk.mk +++ b/mk/disk.mk @@ -1,5 +1,5 @@ build/harddrive.bin: build/kernel build/filesystem.bin bootloader/$(ARCH)/** - nasm -f bin -o $@ -D ARCH_$(ARCH) -D KERNEL=$< -D FILESYSTEM=build/filesystem.bin -ibootloader/$(ARCH)/ bootloader/$(ARCH)/disk.asm + nasm -f bin -o $@ -D ARCH_$(ARCH) -D FILESYSTEM=build/filesystem.bin -ibootloader/$(ARCH)/ bootloader/$(ARCH)/disk.asm build/livedisk.bin: build/kernel_live bootloader/$(ARCH)/** nasm -f bin -o $@ -D ARCH_$(ARCH) -D KERNEL=$< -ibootloader/$(ARCH)/ bootloader/$(ARCH)/disk.asm