diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-02-13 15:29:11 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-13 15:29:11 -0500 |
| commit | 9beb890101c174d3ba61a61db614f2155da35b8f (patch) | |
| tree | 454003bd3f80438ba020cfa067405f742c9a736a | |
| parent | e23ea964389bc2032f02fb4e625431be08f88481 (diff) | |
| parent | d067f0e6717908f4cb6d0c0ac9ba4fea8eb2cebe (diff) | |
Merge branch 'master' into modern_gcc
| -rw-r--r-- | Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -25,7 +25,8 @@ CC1 = $(shell $(CC) --print-prog-name=cc1) -quiet endif CPP := $(PREFIX)cpp LD := $(PREFIX)ld -SHA1SUM := sha1sum -c +OBJCOPY := $(PREFIX)objcopy +SHA1SUM := $(shell { command -v sha1sum || command -v shasum; } 2>/dev/null) -c GBAGFX := tools/gbagfx/gbagfx$(EXE) RSFONT := tools/rsfont/rsfont$(EXE) AIF2PCM := tools/aif2pcm/aif2pcm$(EXE) |