summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorProjectRevoTPP <projectrevotpp@hotmail.com>2016-06-17 08:00:47 -0400
committerYamaArashi <shadow962@live.com>2016-06-17 05:00:47 -0700
commit14dcee450d954cb478974461b7e49c47aefc916d (patch)
tree379a7732c7048b564b7b34181a9b0fae3373bc39 /tools
parent49304ec33bb54592578059ec0da317f1bfc6d4ca (diff)
Potential fix for Issue #1 (#10)
replace all-zero incbins with .space and build fixes for certain Linux configurations
Diffstat (limited to 'tools')
-rw-r--r--tools/gbagfx/Makefile2
-rw-r--r--tools/preproc/Makefile2
-rw-r--r--tools/rsfont/Makefile2
3 files changed, 3 insertions, 3 deletions
diff --git a/tools/gbagfx/Makefile b/tools/gbagfx/Makefile
index e7f089445..3eb7f0b22 100644
--- a/tools/gbagfx/Makefile
+++ b/tools/gbagfx/Makefile
@@ -1,6 +1,6 @@
CC = gcc
-CFLAGS = -Wall -Wextra -std=c11 -O2
+CFLAGS = -Wall -Wextra -std=c11 -O2 -DPNG_SKIP_SETJMP_CHECK
LIBS = -lz -lpng
diff --git a/tools/preproc/Makefile b/tools/preproc/Makefile
index 24f60e3f6..2d577c79f 100644
--- a/tools/preproc/Makefile
+++ b/tools/preproc/Makefile
@@ -1,6 +1,6 @@
CXX := g++
-CXXFLAGS := -std=c++14 -O2 -Wall -Wno-switch
+CXXFLAGS := -std=c++11 -O2 -Wall -Wno-switch
SRCS := asm_file.cpp c_file.cpp charmap.cpp preproc.cpp string_parser.cpp \
utf8.cpp
diff --git a/tools/rsfont/Makefile b/tools/rsfont/Makefile
index 78e0cab3a..9ad47cfcf 100644
--- a/tools/rsfont/Makefile
+++ b/tools/rsfont/Makefile
@@ -1,6 +1,6 @@
CC = gcc
-CFLAGS = -Wall -Wextra -std=c11 -O2
+CFLAGS = -Wall -Wextra -std=c11 -O2 -DPNG_SKIP_SETJMP_CHECK
LIBS = -lz -lpng