diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-05-29 17:14:26 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-29 17:14:26 -0400 |
| commit | 55b3ccba415f8a7a152e91fca08a81420dd03959 (patch) | |
| tree | 761a2e1d92bf94e6c6ba9c43a5c03f279d4bb491 | |
| parent | d49c4d84a4e86c64c73f60ae0d882529734743b9 (diff) | |
| parent | 0ff1d4e382111d9d55245fa9e195508a426a0753 (diff) | |
Merge branch 'master' into work
| -rw-r--r-- | Makefile | 9 | ||||
| -rw-r--r-- | arm7/Makefile | 2 | ||||
| -rw-r--r-- | arm9/Makefile | 2 |
3 files changed, 11 insertions, 2 deletions
@@ -33,6 +33,9 @@ ifeq ($(NOWINE),1) WINE := endif +# Compare result of arm9, arm7, and ROM to sha1 hash(s) +COMPARE ?= 1 + ################ Target Executable and Sources ############### BUILD_DIR := build @@ -213,7 +216,9 @@ endif MAKEFLAGS += --no-print-directory all: $(ROM) +ifeq ($(COMPARE),1) @$(SHA1SUM) -c $(TARGET).sha1 +endif clean: mostlyclean make -C arm9 clean @@ -255,10 +260,10 @@ $(BUILD_DIR)/$(LD_SCRIPT): $(LD_SCRIPT) $(SBINFILES): arm9 arm7 arm9: - $(MAKE) -C arm9 + $(MAKE) -C arm9 COMPARE=$(COMPARE) arm7: - $(MAKE) -C arm7 + $(MAKE) -C arm7 COMPARE=$(COMPARE) $(BINFILES): %.bin: %.sbin @cp $< $@ diff --git a/arm7/Makefile b/arm7/Makefile index 4d89fbd1..8e1dc1d0 100644 --- a/arm7/Makefile +++ b/arm7/Makefile @@ -117,7 +117,9 @@ endif MAKEFLAGS += --no-print-directory all: $(ROM) +ifeq ($(COMPARE),1) @$(SHA1SUM) -c $(TARGET).sha1 +endif clean: mostlyclean make -C $(TOOLS_DIR)/mwasmarm_patcher clean diff --git a/arm9/Makefile b/arm9/Makefile index 994575ff..b15d1b51 100644 --- a/arm9/Makefile +++ b/arm9/Makefile @@ -222,8 +222,10 @@ endif MAKEFLAGS += --no-print-directory all: $(ROM) +ifeq ($(COMPARE),1) @$(SHA1SUM) -c $(TARGET).sha1 @echo $(ROM): OK +endif clean: mostlyclean make -C $(TOOLS_DIR)/mwasmarm_patcher clean |