From 9766108fbc343dec01d3690c1ed8e38daa84d131 Mon Sep 17 00:00:00 2001 From: garakmon Date: Sat, 16 Jun 2018 19:03:20 -0400 Subject: adding agbcc include path For some reason the headers for agbcc are being installed in tools/agbcc instead of tools/agbcc/include. This is a simple (potentially temporary) workaround. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 2afb830cf..1f4514f7b 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,7 @@ 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) -- cgit v1.2.3 From 1ab872c68e951837b6925dbbdf25c4e8d0b63c82 Mon Sep 17 00:00:00 2001 From: garakmon Date: Wed, 18 Jul 2018 15:06:18 -0400 Subject: Allow make compare to work on all platforms --- Makefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 25dd876d6..58a93bb55 100644 --- a/Makefile +++ b/Makefile @@ -31,7 +31,13 @@ LDFLAGS = -Map ../../$(MAP) LIB := -L ../../tools/agbcc/lib -lgcc -lc -SHA1 := sha1sum -c +ifeq ($(OS),Windows_NT) + SHA1 := sha1sum -c +else ifeq ($(shell uname -s),Darwin) + SHA1 := shasum -c +else + SHA1 := sha1sum -c +endif GFX := tools/gbagfx/gbagfx AIF := tools/aif2pcm/aif2pcm -- cgit v1.2.3 From 2cfc7bd358561aa88930a07e2a05d3c919c3beb3 Mon Sep 17 00:00:00 2001 From: Garak Date: Sat, 11 Aug 2018 21:21:43 -0400 Subject: change darwin check --- Makefile | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 58a93bb55..38e8fd71e 100644 --- a/Makefile +++ b/Makefile @@ -31,14 +31,7 @@ LDFLAGS = -Map ../../$(MAP) LIB := -L ../../tools/agbcc/lib -lgcc -lc -ifeq ($(OS),Windows_NT) - SHA1 := sha1sum -c -else ifeq ($(shell uname -s),Darwin) - SHA1 := shasum -c -else - SHA1 := sha1sum -c -endif - +SHA1SUM := $(shell { command -v sha1sum || command -v shasum; } 2>/dev/null) -c GFX := tools/gbagfx/gbagfx AIF := tools/aif2pcm/aif2pcm MID := $(abspath tools/mid2agb/mid2agb) -- cgit v1.2.3 From e0a9faacb58311b697cf704823f8279a077716f0 Mon Sep 17 00:00:00 2001 From: Garak Date: Sat, 11 Aug 2018 21:29:54 -0400 Subject: sha1sum -> sha1 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 38e8fd71e..9637d98a8 100644 --- a/Makefile +++ b/Makefile @@ -31,7 +31,7 @@ LDFLAGS = -Map ../../$(MAP) LIB := -L ../../tools/agbcc/lib -lgcc -lc -SHA1SUM := $(shell { command -v sha1sum || command -v shasum; } 2>/dev/null) -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) -- cgit v1.2.3