X-Git-Url: https://git.rrq.au/?a=blobdiff_plain;f=Makefile;h=3f6972b095a456029aa65f9063d12f5e007fced9;hb=66af56e;hp=c812dccc9bb2933bd480bb73c5bfa14d351c3af5;hpb=5224cfbc1856cd2f4c786f73223b1182acbc96cc;p=rrq%2Fjonasforth.git

diff --git a/Makefile b/Makefile
index c812dcc..3f6972b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 .PHONY: qemu
-qemu: out/main OVMF_CODE.fd OVMF_VARS.fd
+qemu: out/main out/startup.nsh OVMF_CODE.fd OVMF_VARS.fd
 	# Based on https://wiki.osdev.org/UEFI#Emulation_with_QEMU_and_OVMF
 	qemu-system-x86_64 -cpu qemu64 \
 		-drive if=pflash,format=raw,unit=0,file=OVMF_CODE.fd,readonly=on \
@@ -14,12 +14,13 @@ OVMF_CODE.fd: /usr/share/ovmf/x64/OVMF_CODE.fd
 OVMF_VARS.fd: /usr/share/ovmf/x64/OVMF_VARS.fd
 	cp $< $@
 
-out/main: main.asm impl.asm bootstrap.asm sys.f os/uefi.asm
+out/main: src/main.asm src/impl.asm src/bootstrap.asm src/uefi.asm init/sys.f init/uefi.f
 	mkdir -p out
-	OS_INCLUDE=os/uefi.asm fasm $< $@
+	fasm $< $@
 
-main: main.asm impl.asm bootstrap.asm sys.f os/linux.asm
-	OS_INCLUDE=os/linux.asm fasm $< $@
+out/startup.nsh:
+	mkdir -p out
+	echo 'fs0:main' >out/startup.nsh
 
 .PHONY: clean
 clean: