summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2018-08-12 12:11:35 +0200
committerDizzyEggg <jajkodizzy@wp.pl>2018-08-12 12:11:35 +0200
commit957dcd01b382fb74e9b1967851ef3cfb6ca983eb (patch)
tree5eb81cbb67be2303952d85da2ca5f9b2ec61c044 /Makefile
parente787d5b60230550a4a8f1f3251b90e141bfcc5ff (diff)
parent40cf61307b411ea4de858902c7081fde8ef71ea5 (diff)
merge with master
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)