From 6d729d8f3b433de842f36fbb9fea134597aac866 Mon Sep 17 00:00:00 2001 From: alpine9000 Date: Tue, 15 Mar 2016 16:31:49 +1100 Subject: [PATCH] Forgot to add base.mk --- shared/base.mk | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/shared/base.mk b/shared/base.mk index fe02e62..e614ddf 100644 --- a/shared/base.mk +++ b/shared/base.mk @@ -16,6 +16,14 @@ ifndef RUN_SCRIPT RUN_SCRIPT=$(A500_RUN_SCRIPT) endif +ifndef BOOTBLOCK_ASM +BOOTBLOCK_ASM=../shared/bootblock.s +endif + +ifndef PROGRAM_BIN +PROGRAM_BIN=out/main.bin +endif + all: bin out $(MAKEADF) $(FLOPPY) gdrive: all @@ -56,8 +64,8 @@ $(FLOPPY): out/bootblock.bin out/bootblock.bin: out/bootblock.o vlink -brawbin1 $< -o $@ -out/bootblock.o: ../shared/bootblock.s out/main.bin - vasmm68k_mot -DBASE_ADDRESS="\$$$(BASE_ADDRESS)" -Fhunk -phxass -opt-fconst -nowarn=62 -quiet $< -o $@ -I/usr/local/amiga/os-include +out/bootblock.o: $(BOOTBLOCK_ASM) $(PROGRAM_BIN) + vasmm68k_mot $(VASM_EXTRA_BOOTBLOCK_ARGS) -DBASE_ADDRESS="\$$$(BASE_ADDRESS)" -Fhunk -phxass -opt-fconst -nowarn=62 -quiet $< -o $@ -I/usr/local/amiga/os-include out/main.o: $(MODULE) $(EXTRA) @# -v