Merge remote-tracking branch 'upstream/master'

INSTALL.md

@@ -37,15 +37,12 @@ To set up the repository:
 	sh install.sh ../tmc
 
 	cd ../tmc
+	make tools
 
 To build **tmc.gba**:
 
 	make -j$(nproc)
 
-To confirm it matches the official ROM image while building, do this instead:
-
-	make compare -j$(nproc)
-
 If only `.c` or `.s` files were changed, turn off the dependency scanning temporarily. Changes to any other files will be ignored and the build will either fail or not reflect those changes.
 
 	make -j$(nproc) NODEP=1

Makefile

@@ -110,28 +110,24 @@ TOOLDIRS := $(filter-out tools/agbcc tools/binutils,$(wildcard tools/*))
 TOOLBASE = $(TOOLDIRS:tools/%=%)
 TOOLS = $(foreach tool,$(TOOLBASE),tools/$(tool)/$(tool)$(EXE))
 
-.PHONY: all rom tools clean-tools mostlyclean clean compare tidy $(TOOLDIRS)
+.PHONY: all setup clean-tools mostlyclean clean tidy $(TOOLDIRS)
 
 MAKEFLAGS += --no-print-directory
 
 AUTO_GEN_TARGETS :=
 
-all: tools rom
-
-rom: $(ROM)
-ifeq ($(COMPARE),1)
+all: $(ROM)
 	@$(SHA1) tmc.sha1
-endif
 
-tools: $(TOOLDIRS)
+# kept for backwards compat
+compare: $(ROM)
+	@$(SHA1) tmc.sha1
+
+setup: $(TOOLDIRS)
 
 $(TOOLDIRS):
 	@$(MAKE) -C $@
 
-# For contributors to make sure a change didn't affect the contents of the ROM.
-compare:
-	@$(MAKE) COMPARE=1
-
 mostlyclean: tidy
 	rm -f sound/direct_sound_samples/*.bin
 	rm -f $(SONG_OBJS) $(MID_SUBDIR)/*.s