ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-25 11:14:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

compiler fixes

Browse Source 
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.
This commit is contained in:
garakmon 2018-06-16 18:49:27 -04:00
parent 46f9b83fe5
commit 13ed20c6e3
9 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/aif2pcm/Makefile
View File

@ -1,6 +1,6 @@
CC = gcc CC = gcc
CFLAGS = -Wall -Wextra -Wno-switch -Werror -std=c11 -O2 -s CFLAGS = -Wall -Wextra -Wno-switch -Werror -std=c11 -O2
LIBS = -lm LIBS = -lm

4
tools/aif2pcm/main.c
View File

@ -469,12 +469,12 @@ do { \
void aif2pcm(const char *aif_filename, const char *pcm_filename, bool compress) void aif2pcm(const char *aif_filename, const char *pcm_filename, bool compress)
{ {
struct Bytes *aif = read_bytearray(aif_filename); struct Bytes *aif = read_bytearray(aif_filename);
AifData aif_data = {0}; AifData aif_data;
read_aif(aif, &aif_data); read_aif(aif, &aif_data);
int header_size = 0x10; int header_size = 0x10;
struct Bytes *pcm; struct Bytes *pcm;
struct Bytes output = {0}; struct Bytes output;
if (compress) if (compress)
{ {

2
tools/bin2c/Makefile
View File

@ -1,6 +1,6 @@
CC = gcc CC = gcc
CFLAGS = -Wall -Wextra -Werror -std=c11 -O2 -s CFLAGS = -Wall -Wextra -Werror -std=c11 -O2
.PHONY: clean .PHONY: clean

2
tools/gbagfx/Makefile
View File

@ -1,6 +1,6 @@
CC = gcc 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 LIBS = -lpng -lz

2
tools/mid2agb/Makefile
View File

@ -1,6 +1,6 @@
CXX := g++ 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 SRCS := agb.cpp error.cpp main.cpp midi.cpp tables.cpp

2
tools/preproc/Makefile
View File

@ -1,6 +1,6 @@
CXX := g++ 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 \ SRCS := asm_file.cpp c_file.cpp charmap.cpp preproc.cpp string_parser.cpp \
utf8.cpp utf8.cpp

2
tools/ramscrgen/Makefile
View File

@ -1,6 +1,6 @@
CXX := g++ 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 SRCS := main.cpp sym_file.cpp elf.cpp

2
tools/rsfont/Makefile
View File

@ -1,6 +1,6 @@
CC = gcc 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 LIBS = -lpng -lz

2
tools/scaninc/Makefile
View File

@ -1,6 +1,6 @@
CXX = g++ 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 SRCS = scaninc.cpp c_file.cpp asm_file.cpp