From 469058e363f524fbf075ecb45d16a6ce3a25b854 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Tue, 21 Apr 2020 00:59:59 -0400 Subject: [PATCH] Makefile machinery work --- makefile => Makefile | 2 +- fixbaserom.py | 2 ++ tools/Makefile | 5 +++++ 3 files changed, 8 insertions(+), 1 deletion(-) rename makefile => Makefile (99%) diff --git a/makefile b/Makefile similarity index 99% rename from makefile rename to Makefile index 2052ddb974..30ef739f4a 100644 --- a/makefile +++ b/Makefile @@ -132,7 +132,7 @@ clean: setup: git submodule update --init --recursive - make -C tools + make ido7 all -C tools python3 fixbaserom.py python3 extract_baserom.py python3 extract_assets.py diff --git a/fixbaserom.py b/fixbaserom.py index df84332bae..0d6777e87b 100644 --- a/fixbaserom.py +++ b/fixbaserom.py @@ -7,6 +7,8 @@ import hashlib # Determine if we have a ROM file romFileName = "" +if (path.exists("baserom.z64")): + romFileName = "baserom.z64" if (path.exists("baserom_original.z64")): romFileName = "baserom_original.z64" elif (path.exists("baserom_original.n64")): diff --git a/tools/Makefile b/tools/Makefile index dd514d09eb..30f1671603 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -25,3 +25,8 @@ $(1): $($1_SOURCES) endef $(foreach p,$(PROGRAMS),$(eval $(call COMPILE,$(p)))) + +ido7: + wget -O ido7.zip https://github.com/zeldaret/oot/releases/download/0.1/ido7.1_fixed.zip + unzip -n ido7.zip + rm ido7.zip