From 8e8d99e6fd20a04ee6add394c24bb36aab83c47e Mon Sep 17 00:00:00 2001 From: MMDecomp Date: Thu, 30 Apr 2020 15:06:25 +0200 Subject: [PATCH] Improve Drag & Drop support for IDO Tools - Add optional default for QEMU_IRIX to Makefile - Add tools/qemu-mips to .gitignore - `make clean` should not fail if rom.z64 doesnt exist --- .gitignore | 3 ++- Makefile | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e844be6fb7..81f77a6185 100644 --- a/.gitignore +++ b/.gitignore @@ -18,4 +18,5 @@ src/test.c *.dump tools/ido5.3_compiler/* tools/ido7.1_compiler/* -expected/* \ No newline at end of file +expected/* +tools/qemu-mips diff --git a/Makefile b/Makefile index 42fb7e5cbd..d24db81e53 100644 --- a/Makefile +++ b/Makefile @@ -3,6 +3,7 @@ AS := $(MIPS_BINUTILS_PREFIX)as LD := $(MIPS_BINUTILS_PREFIX)ld +QEMU_IRIX ?= ./tools/qemu-mips IRIX_71_ROOT := ./tools/ido7.1_compiler/ IRIX_53_ROOT := ./tools/ido5.3_compiler/ @@ -95,7 +96,7 @@ test.txt: build/src/test.o $(MIPS_BINUTILS_PREFIX)objdump -d -z --adjust-vma=0x80080790 $< > test.txt clean: - rm $(ROM) -r build + rm -f $(ROM) -r build build/baserom/dmadata: $(COMP_FILES) $(DECOMP_FILES) $(BASEROM_BUILD_FILES) ./tools/dmadata.py ./tables/dmadata_table.txt $@