compiler fixes

The compiler flag -s is not necessary and causes build failure on some
systems (macOS, clang compilers) due to it being deprecated.
Additionally, on those same systems, tools/aif2pcm/main.c failed to
compile due to an overly cautious compiler not liking some struct
declarations.
These changes afaik do not affect other builds.

9 files changed, 10 insertions, 10 deletions

diff --git a/tools/aif2pcm/Makefile b/tools/aif2pcm/Makefile
index 967930c59..e5cb6ad31 100644
--- a/tools/aif2pcm/Makefile
+++ b/tools/aif2pcm/Makefile
@@ -1,6 +1,6 @@
 CC = gcc
 
-CFLAGS = -Wall -Wextra -Wno-switch -Werror -std=c11 -O2 -s
+CFLAGS = -Wall -Wextra -Wno-switch -Werror -std=c11 -O2
 
 LIBS = -lm
 
diff --git a/tools/aif2pcm/main.c b/tools/aif2pcm/main.c
index fbb024a1d..b6287a1dd 100644
--- a/tools/aif2pcm/main.c
+++ b/tools/aif2pcm/main.c
@@ -469,12 +469,12 @@ do { \
 void aif2pcm(const char *aif_filename, const char *pcm_filename, bool compress)
 {
 	struct Bytes *aif = read_bytearray(aif_filename);
-	AifData aif_data = {0};
+	AifData aif_data;
 	read_aif(aif, &aif_data);
 
 	int header_size = 0x10;
 	struct Bytes *pcm;
-	struct Bytes output = {0};
+	struct Bytes output;
 
 	if (compress)
 	{
diff --git a/tools/bin2c/Makefile b/tools/bin2c/Makefile
index 4cc23a25a..73f78980e 100644
--- a/tools/bin2c/Makefile
+++ b/tools/bin2c/Makefile
@@ -1,6 +1,6 @@
 CC = gcc
 
-CFLAGS = -Wall -Wextra -Werror -std=c11 -O2 -s
+CFLAGS = -Wall -Wextra -Werror -std=c11 -O2
 
 .PHONY: clean
 
diff --git a/tools/gbagfx/Makefile b/tools/gbagfx/Makefile
index d791dabb5..6f11b1b3f 100644
--- a/tools/gbagfx/Makefile
+++ b/tools/gbagfx/Makefile
@@ -1,6 +1,6 @@
 CC = gcc
 
-CFLAGS = -Wall -Wextra -Werror -std=c11 -O2 -s -DPNG_SKIP_SETJMP_CHECK
+CFLAGS = -Wall -Wextra -Werror -std=c11 -O2 -DPNG_SKIP_SETJMP_CHECK
 
 LIBS = -lpng -lz
 
diff --git a/tools/mid2agb/Makefile b/tools/mid2agb/Makefile
index f27f2cad4..7fd5d5fc8 100644
--- a/tools/mid2agb/Makefile
+++ b/tools/mid2agb/Makefile
@@ -1,6 +1,6 @@
 CXX := g++
 
-CXXFLAGS := -std=c++11 -O2 -s -Wall -Wno-switch -Werror
+CXXFLAGS := -std=c++11 -O2 -Wall -Wno-switch -Werror
 
 SRCS := agb.cpp error.cpp main.cpp midi.cpp tables.cpp
 
diff --git a/tools/preproc/Makefile b/tools/preproc/Makefile
index ec4a5f365..3d3275819 100644
--- a/tools/preproc/Makefile
+++ b/tools/preproc/Makefile
@@ -1,6 +1,6 @@
 CXX := g++
 
-CXXFLAGS := -std=c++11 -O2 -s -Wall -Wno-switch -Werror
+CXXFLAGS := -std=c++11 -O2 -Wall -Wno-switch -Werror
 
 SRCS := asm_file.cpp c_file.cpp charmap.cpp preproc.cpp string_parser.cpp \
 	utf8.cpp
diff --git a/tools/ramscrgen/Makefile b/tools/ramscrgen/Makefile
index cc6d458ba..9aa309aa1 100644
--- a/tools/ramscrgen/Makefile
+++ b/tools/ramscrgen/Makefile
@@ -1,6 +1,6 @@
 CXX := g++
 
-CXXFLAGS := -std=c++11 -O2 -s -Wall -Wno-switch -Werror
+CXXFLAGS := -std=c++11 -O2 -Wall -Wno-switch -Werror
 
 SRCS := main.cpp sym_file.cpp elf.cpp
 
diff --git a/tools/rsfont/Makefile b/tools/rsfont/Makefile
index a78beca50..582be7b88 100644
--- a/tools/rsfont/Makefile
+++ b/tools/rsfont/Makefile
@@ -1,6 +1,6 @@
 CC = gcc
 
-CFLAGS = -Wall -Wextra -Werror -std=c11 -O2 -s -DPNG_SKIP_SETJMP_CHECK
+CFLAGS = -Wall -Wextra -Werror -std=c11 -O2 -DPNG_SKIP_SETJMP_CHECK
 
 LIBS = -lpng -lz
 
diff --git a/tools/scaninc/Makefile b/tools/scaninc/Makefile
index 3e1c031a8..367a3350b 100644
--- a/tools/scaninc/Makefile
+++ b/tools/scaninc/Makefile
@@ -1,6 +1,6 @@
 CXX = g++
 
-CXXFLAGS = -Wall -Werror -std=c++11 -O2 -s
+CXXFLAGS = -Wall -Werror -std=c++11 -O2
 
 SRCS = scaninc.cpp c_file.cpp asm_file.cpp