From 158eeb81b58c78b153333ec674c76b02b51d6889 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Wed, 27 Sep 2017 20:24:45 -0600 Subject: [PATCH] Add rule for making detached bootloader --- bootloader | 2 +- mk/disk.mk | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/bootloader b/bootloader index 59fd6fbcf..cccb19d19 160000 --- a/bootloader +++ b/bootloader @@ -1 +1 @@ -Subproject commit 59fd6fbcfe9adc7e5d0c0df58fe4e2e07df5f31b +Subproject commit cccb19d19ff27724e412cf3b21750f82ebbb20d1 diff --git a/mk/disk.mk b/mk/disk.mk index f78bbab89..19975bddc 100644 --- a/mk/disk.mk +++ b/mk/disk.mk @@ -1,5 +1,8 @@ -build/harddrive.bin: build/kernel build/filesystem.bin bootloader/$(ARCH)/** - nasm -f bin -o $@ -D ARCH_$(ARCH) -D FILESYSTEM=build/filesystem.bin -ibootloader/$(ARCH)/ bootloader/$(ARCH)/disk.asm +build/bootloader.bin: bootloader/$(ARCH)/** + nasm -f bin -o $@ -D ARCH_$(ARCH) -ibootloader/$(ARCH)/ bootloader/$(ARCH)/disk.asm + +build/harddrive.bin: build/filesystem.bin bootloader/$(ARCH)/** + nasm -f bin -o $@ -D ARCH_$(ARCH) -D FILESYSTEM=$< -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