diff options
| author | red031000 <rubenru09@aol.com> | 2020-06-20 21:25:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-20 21:25:34 +0100 |
| commit | 7e6562f747a773ef3ad764c6d0b6b1f2e7d6cfc6 (patch) | |
| tree | 24e1bb3e1a14991110255665aee09957c9306a0f /arm9 | |
| parent | 863b09f18dca59864a95cc72afdaac9b13332d13 (diff) | |
| parent | e9e192ce20e2f863a836c3ee9ab364921d068116 (diff) | |
Merge branch 'master' into master
Diffstat (limited to 'arm9')
| -rw-r--r-- | arm9/Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arm9/Makefile b/arm9/Makefile index 17033200..36e19417 100644 --- a/arm9/Makefile +++ b/arm9/Makefile @@ -192,7 +192,11 @@ LDFLAGS = -nodead -w off -proc v5te -interworking -map closure,unused -symtab so ####################### Other Tools ######################### # DS TOOLS +ifndef BUSYBOX SHA1SUM = sha1sum --quiet +else +SHA1SUM = sha1sum +endif JSONPROC = $(TOOLS_DIR)/jsonproc/jsonproc$(EXE) GFX = $(TOOLS_DIR)/nitrogfx/nitrogfx$(EXE) SCANINC = $(TOOLS_DIR)/scaninc/scaninc$(EXE) |