diff options
| author | who-knows-who <j.williams97@outlook.com> | 2021-02-27 15:29:36 +0000 |
|---|---|---|
| committer | who-knows-who <j.williams97@outlook.com> | 2021-02-27 15:29:36 +0000 |
| commit | aa968bb2de4d703376af43a0ef32a53ca46f489b (patch) | |
| tree | 699d89dda03b1b81b4a0a87b8694073a71157d1a /arm7 | |
| parent | e13202e2f19c9f1673a021dbcc062d96b9f0f06c (diff) | |
| parent | 75dc81c75dc1dc86053303cdae9decdb2f05557d (diff) | |
Merge branch 'master' of github.com:pret/pokediamond
Diffstat (limited to 'arm7')
| -rw-r--r-- | arm7/Makefile | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arm7/Makefile b/arm7/Makefile index 88f796a0..d142c079 100644 --- a/arm7/Makefile +++ b/arm7/Makefile @@ -96,13 +96,18 @@ LDFLAGS = -map -nodead -w off -proc v4t -interworking -map -symtab -m _start ####################### Other Tools ######################### # DS TOOLS +UNAME_S := $(shell uname -s) +ifeq ($(UNAME_S),Darwin) +SHA1SUM = shasum +else SHA1SUM = sha1sum +endif JSONPROC = $(TOOLS_DIR)/jsonproc/jsonproc GFX = $(TOOLS_DIR)/nitrogfx/nitrogfx SCANINC = $(TOOLS_DIR)/scaninc/scaninc$(EXE) MWASMARM_PATCHER = $(TOOLS_DIR)/mwasmarm_patcher/mwasmarm_patcher$(EXE) -q -TOOLDIRS = $(filter-out $(TOOLS_DIR)/mwccarm $(TOOLS_DIR)/bin,$(wildcard $(TOOLS_DIR)/*)) +TOOLDIRS = $(filter-out $(TOOLS_DIR)/asm_processor $(TOOLS_DIR)/mwccarm $(TOOLS_DIR)/bin,$(wildcard $(TOOLS_DIR)/*)) TOOLBASE = $(TOOLDIRS:$(TOOLS_DIR)/%=%) TOOLS = $(foreach tool,$(TOOLBASE),$(TOOLS_DIR)/$(tool)/$(tool)$(EXE)) |