From 294c9656bec076e1993375966a725723a931fa33 Mon Sep 17 00:00:00 2001 From: yenatch Date: Sat, 13 Jan 2018 01:30:08 -0500 Subject: fix broken build after building without tools --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index a0f93e250..585236e75 100644 --- a/Makefile +++ b/Makefile @@ -43,8 +43,10 @@ SCANINC := tools/scaninc/scaninc PREPROC := tools/preproc/preproc RAMSCRGEN := tools/ramscrgen/ramscrgen -# Clear the default suffixes. +# Clear the default suffixes .SUFFIXES: +# Delete files that weren't built properly +.DELETE_ON_ERROR: # Secondary expansion is required for dependency variables in object rules. .SECONDEXPANSION: -- cgit v1.2.3 From 98ee41806e87f5b1cd43bab4dff1466b65aa036c Mon Sep 17 00:00:00 2001 From: yenatch Date: Sat, 13 Jan 2018 01:30:43 -0500 Subject: use .SECONDARY instead of .PRECIOUS to prevent files from being deleted --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 585236e75..14768cd2f 100644 --- a/Makefile +++ b/Makefile @@ -45,14 +45,14 @@ RAMSCRGEN := tools/ramscrgen/ramscrgen # Clear the default suffixes .SUFFIXES: +# Don't delete intermediate files +.SECONDARY: # Delete files that weren't built properly .DELETE_ON_ERROR: # Secondary expansion is required for dependency variables in object rules. .SECONDEXPANSION: -.PRECIOUS: %.1bpp %.4bpp %.8bpp %.gbapal %.lz %.rl %.pcm %.bin sound/direct_sound_samples/cry_%.bin - .PHONY: rom clean compare tidy $(shell mkdir -p $(C_BUILDDIR) $(ASM_BUILDDIR) $(DATA_ASM_BUILDDIR) $(SONG_BUILDDIR)) -- cgit v1.2.3 From 84d364819acb147ea7651ec3d890cd0b985e40be Mon Sep 17 00:00:00 2001 From: yenatch Date: Sat, 13 Jan 2018 01:31:07 -0500 Subject: add a rule for baserom.gba --- Makefile | 3 +++ 1 file changed, 3 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 14768cd2f..fa2acb282 100644 --- a/Makefile +++ b/Makefile @@ -168,3 +168,6 @@ $(ELF): $(OBJ_DIR)/ld_script.ld $(OBJS) $(ROM): $(ELF) $(OBJCOPY) -O binary --gap-fill 0xFF --pad-to 0x9000000 $< $@ + +baserom.gba: ; + $(error baserom.gba is required to build) -- cgit v1.2.3