diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/aif2pcm/Makefile | 2 | ||||
| -rw-r--r-- | tools/bin2c/Makefile | 2 | ||||
| -rw-r--r-- | tools/gbagfx/Makefile | 2 | ||||
| -rw-r--r-- | tools/gbagfx/main.c | 7 | ||||
| -rw-r--r-- | tools/mid2agb/Makefile | 2 | ||||
| -rw-r--r-- | tools/preproc/Makefile | 2 | ||||
| -rw-r--r-- | tools/ramscrgen/Makefile | 2 | ||||
| -rw-r--r-- | tools/rsfont/Makefile | 2 | ||||
| -rw-r--r-- | tools/scaninc/Makefile | 2 |
9 files changed, 10 insertions, 13 deletions
diff --git a/tools/aif2pcm/Makefile b/tools/aif2pcm/Makefile index 611c0e2df..967930c59 100644 --- a/tools/aif2pcm/Makefile +++ b/tools/aif2pcm/Makefile @@ -1,6 +1,6 @@ CC = gcc -CFLAGS = -Wall -Wextra -Wno-switch -std=c11 -O2 -s +CFLAGS = -Wall -Wextra -Wno-switch -Werror -std=c11 -O2 -s LIBS = -lm diff --git a/tools/bin2c/Makefile b/tools/bin2c/Makefile index bd5f60490..4cc23a25a 100644 --- a/tools/bin2c/Makefile +++ b/tools/bin2c/Makefile @@ -1,6 +1,6 @@ CC = gcc -CFLAGS = -Wall -Wextra -std=c11 -O2 -s +CFLAGS = -Wall -Wextra -Werror -std=c11 -O2 -s .PHONY: clean diff --git a/tools/gbagfx/Makefile b/tools/gbagfx/Makefile index 9a5dee1cc..d791dabb5 100644 --- a/tools/gbagfx/Makefile +++ b/tools/gbagfx/Makefile @@ -1,6 +1,6 @@ CC = gcc -CFLAGS = -Wall -Wextra -std=c11 -O2 -s -DPNG_SKIP_SETJMP_CHECK +CFLAGS = -Wall -Wextra -Werror -std=c11 -O2 -s -DPNG_SKIP_SETJMP_CHECK LIBS = -lpng -lz diff --git a/tools/gbagfx/main.c b/tools/gbagfx/main.c index 0624201df..37d3441fe 100644 --- a/tools/gbagfx/main.c +++ b/tools/gbagfx/main.c @@ -59,8 +59,7 @@ void HandleGbaToPngCommand(char *inputPath, char *outputPath, int argc, char **a { char *inputFileExtension = GetFileExtension(inputPath); int bitDepth = inputFileExtension[0] - '0'; - char *paletteFilePath; - bool hasPalette = false; + char *paletteFilePath = NULL; bool hasTransparency = false; int width = 1; @@ -76,8 +75,6 @@ void HandleGbaToPngCommand(char *inputPath, char *outputPath, int argc, char **a i++; paletteFilePath = argv[i]; - - hasPalette = true; } else if (strcmp(option, "-object") == 0) { @@ -102,7 +99,7 @@ void HandleGbaToPngCommand(char *inputPath, char *outputPath, int argc, char **a } } - ConvertGbaToPng(inputPath, outputPath, width, bitDepth, hasPalette ? paletteFilePath : NULL, hasTransparency); + ConvertGbaToPng(inputPath, outputPath, width, bitDepth, paletteFilePath, hasTransparency); } void HandlePngToGbaCommand(char *inputPath, char *outputPath, int argc, char **argv) diff --git a/tools/mid2agb/Makefile b/tools/mid2agb/Makefile index accd81882..f27f2cad4 100644 --- a/tools/mid2agb/Makefile +++ b/tools/mid2agb/Makefile @@ -1,6 +1,6 @@ CXX := g++ -CXXFLAGS := -std=c++11 -O2 -s -Wall -Wno-switch +CXXFLAGS := -std=c++11 -O2 -s -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 1f4c58e21..ec4a5f365 100644 --- a/tools/preproc/Makefile +++ b/tools/preproc/Makefile @@ -1,6 +1,6 @@ CXX := g++ -CXXFLAGS := -std=c++11 -O2 -s -Wall -Wno-switch +CXXFLAGS := -std=c++11 -O2 -s -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 6c4ca28b6..cc6d458ba 100644 --- a/tools/ramscrgen/Makefile +++ b/tools/ramscrgen/Makefile @@ -1,6 +1,6 @@ CXX := g++ -CXXFLAGS := -std=c++11 -O2 -s -Wall -Wno-switch +CXXFLAGS := -std=c++11 -O2 -s -Wall -Wno-switch -Werror SRCS := main.cpp sym_file.cpp elf.cpp diff --git a/tools/rsfont/Makefile b/tools/rsfont/Makefile index 544954bfc..a78beca50 100644 --- a/tools/rsfont/Makefile +++ b/tools/rsfont/Makefile @@ -1,6 +1,6 @@ CC = gcc -CFLAGS = -Wall -Wextra -std=c11 -O2 -s -DPNG_SKIP_SETJMP_CHECK +CFLAGS = -Wall -Wextra -Werror -std=c11 -O2 -s -DPNG_SKIP_SETJMP_CHECK LIBS = -lpng -lz diff --git a/tools/scaninc/Makefile b/tools/scaninc/Makefile index d33dee6d2..3e1c031a8 100644 --- a/tools/scaninc/Makefile +++ b/tools/scaninc/Makefile @@ -1,6 +1,6 @@ CXX = g++ -CXXFLAGS = -Wall -std=c++11 -O2 -s +CXXFLAGS = -Wall -Werror -std=c++11 -O2 -s SRCS = scaninc.cpp c_file.cpp asm_file.cpp |