summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorPhlosioneer <mattmdrr2@gmail.com>2019-02-18 01:12:47 -0500
committerPhlosioneer <mattmdrr2@gmail.com>2019-02-18 01:12:47 -0500
commit5695617d64335474ead8a7e25c539daebcc55fa5 (patch)
tree0e9791a86b6aff83ab99aa9dd9878558f89fb824 /Makefile
parent08579edbcd596c9659fe25490480c6f96e2b4288 (diff)
parente95140270be790b03e693f539770abfd6473916e (diff)
Merge branch 'master' into multiplayer-stuff
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 1841eb6b8..c9a7c2e05 100644
--- a/Makefile
+++ b/Makefile
@@ -38,7 +38,7 @@ ASFLAGS := -mcpu=arm7tdmi
CC1 := tools/agbcc/bin/agbcc$(EXE)
override CFLAGS += -mthumb-interwork -Wimplicit -Wparentheses -Werror -O2 -fhex-asm
-CPPFLAGS := -I tools/agbcc/include -I tools/agbcc -iquote include
+CPPFLAGS := -I tools/agbcc/include -I tools/agbcc -iquote include -Wno-trigraphs
LDFLAGS = -Map ../../$(MAP)