summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorDiegoisawesome <Diegoisawesome@users.noreply.github.com>2018-08-11 18:37:09 -0700
committerGitHub <noreply@github.com>2018-08-11 18:37:09 -0700
commit40cf61307b411ea4de858902c7081fde8ef71ea5 (patch)
treeee40961b2552603a76a8a07cb4c28cf8be476664 /Makefile
parent419917cdb012a5bfdb26f2929efe43677b53b728 (diff)
parente0a9faacb58311b697cf704823f8279a077716f0 (diff)
Merge pull request #267 from garakmon/master
macOS support
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile5
1 files changed, 2 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index eb15d11ab..9637d98a8 100644
--- a/Makefile
+++ b/Makefile
@@ -25,14 +25,13 @@ ASFLAGS := -mcpu=arm7tdmi
CC1 := tools/agbcc/bin/agbcc
override CFLAGS += -mthumb-interwork -Wimplicit -Wparentheses -Werror -O2 -fhex-asm
-CPPFLAGS := -I tools/agbcc/include -iquote include -nostdinc -undef
+CPPFLAGS := -I tools/agbcc/include -I tools/agbcc -iquote include -nostdinc -undef
LDFLAGS = -Map ../../$(MAP)
LIB := -L ../../tools/agbcc/lib -lgcc -lc
-SHA1 := sha1sum -c
-
+SHA1 := $(shell { command -v sha1sum || command -v shasum; } 2>/dev/null) -c
GFX := tools/gbagfx/gbagfx
AIF := tools/aif2pcm/aif2pcm
MID := $(abspath tools/mid2agb/mid2agb)