diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2018-01-16 15:57:10 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2018-01-16 15:57:10 -0600 |
| commit | 23f45bd2b6790df259caa180d46706cbdd54f86f (patch) | |
| tree | 6e7fa2c507572ef6aa9bbeaefa6a4e61bc1a1831 | |
| parent | 309640a28c63528fda8d6b50b9d5bb83eddeb8c9 (diff) | |
| parent | 0051d8aeeaea614b3d8c23f80df7d8b1dd6c607f (diff) | |
Merge remote-tracking branch 'origin/delete-on-error'
| -rw-r--r-- | Makefile | 11 | ||||
| -rwxr-xr-x[-rw-r--r--] | build_tools.sh | 0 |
2 files changed, 8 insertions, 3 deletions
@@ -43,14 +43,16 @@ SCANINC := tools/scaninc/scaninc PREPROC := tools/preproc/preproc RAMSCRGEN := tools/ramscrgen/ramscrgen -# Clear the default suffixes. +# 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)) @@ -166,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) diff --git a/build_tools.sh b/build_tools.sh index 26f1f35b3..26f1f35b3 100644..100755 --- a/build_tools.sh +++ b/build_tools.sh |