Merge remote-tracking branch 'upstream/master'

This commit is contained in:
theo3 2020-07-17 01:28:29 -07:00
commit a6a5367d6d
2 changed files with 8 additions and 15 deletions

View File

@ -37,15 +37,12 @@ To set up the repository:
sh install.sh ../tmc sh install.sh ../tmc
cd ../tmc cd ../tmc
make tools
To build **tmc.gba**: To build **tmc.gba**:
make -j$(nproc) 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. 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 make -j$(nproc) NODEP=1

View File

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