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

Fix Makefiles to account for the $CC and $CXX environment variables

Browse Source
This commit is contained in:
aaaaaa123456789 2019-08-06 20:30:57 -03:00
parent 2a0517f0fd
commit e28cf5406b
12 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Makefile
View File

@ -1,4 +1,17 @@
TOOLCHAIN := $(DEVKITARM) TOOLCHAIN := $(DEVKITARM)
ifeq ($(CC),)
HOSTCC := gcc
else
HOSTCC := $(CC)
endif
ifeq ($(CXX),)
HOSTCXX := g++
else
HOSTCXX := $(CXX)
endif
ifneq (,$(wildcard $(TOOLCHAIN)/base_tools)) ifneq (,$(wildcard $(TOOLCHAIN)/base_tools))
include $(TOOLCHAIN)/base_tools include $(TOOLCHAIN)/base_tools
else else
@ -136,7 +149,7 @@ all: rom
tools: $(TOOLDIRS) tools: $(TOOLDIRS)
$(TOOLDIRS): $(TOOLDIRS):
@$(MAKE) -C $@ @$(MAKE) -C $@ CC=$(HOSTCC) CXX=$(HOSTCXX)
rom: $(ROM) rom: $(ROM)

2
tools/aif2pcm/Makefile
View File

@ -1,4 +1,4 @@
CC = gcc CC ?= gcc
CFLAGS = -Wall -Wextra -Wno-switch -Werror -std=c11 -O2 CFLAGS = -Wall -Wextra -Wno-switch -Werror -std=c11 -O2

2
tools/bin2c/Makefile
View File

@ -1,4 +1,4 @@
CC = gcc CC ?= gcc
CFLAGS = -Wall -Wextra -Werror -std=c11 -O2 CFLAGS = -Wall -Wextra -Werror -std=c11 -O2

2
tools/gbafix/Makefile
View File

@ -1,4 +1,4 @@
CC = gcc CC ?= gcc
.PHONY: all clean .PHONY: all clean
SRCS = gbafix.c SRCS = gbafix.c

2
tools/gbagfx/Makefile
View File

@ -1,4 +1,4 @@
CC = gcc CC ?= gcc
CFLAGS = -Wall -Wextra -Werror -std=c11 -O2 -DPNG_SKIP_SETJMP_CHECK CFLAGS = -Wall -Wextra -Werror -std=c11 -O2 -DPNG_SKIP_SETJMP_CHECK

2
tools/jsonproc/Makefile
View File

@ -1,4 +1,4 @@
CXX := g++ CXX ?= g++
CXXFLAGS := -Wall -std=c++11 -O2 CXXFLAGS := -Wall -std=c++11 -O2

2
tools/mapjson/Makefile
View File

@ -1,4 +1,4 @@
CXX := g++ CXX ?= g++
CXXFLAGS := -Wall -std=c++11 -O2 CXXFLAGS := -Wall -std=c++11 -O2

2
tools/mid2agb/Makefile
View File

@ -1,4 +1,4 @@
CXX := g++ CXX ?= g++
CXXFLAGS := -std=c++11 -O2 -Wall -Wno-switch -Werror CXXFLAGS := -std=c++11 -O2 -Wall -Wno-switch -Werror

2
tools/preproc/Makefile
View File

@ -1,4 +1,4 @@
CXX := g++ CXX ?= g++
CXXFLAGS := -std=c++11 -O2 -Wall -Wno-switch -Werror CXXFLAGS := -std=c++11 -O2 -Wall -Wno-switch -Werror

2
tools/ramscrgen/Makefile
View File

@ -1,4 +1,4 @@
CXX := g++ CXX ?= g++
CXXFLAGS := -std=c++11 -O2 -Wall -Wno-switch -Werror CXXFLAGS := -std=c++11 -O2 -Wall -Wno-switch -Werror

2
tools/rsfont/Makefile
View File

@ -1,4 +1,4 @@
CC = gcc CC ?= gcc
CFLAGS = -Wall -Wextra -Werror -std=c11 -O2 -DPNG_SKIP_SETJMP_CHECK CFLAGS = -Wall -Wextra -Werror -std=c11 -O2 -DPNG_SKIP_SETJMP_CHECK

2
tools/scaninc/Makefile
View File

@ -1,4 +1,4 @@
CXX = g++ CXX ?= g++
CXXFLAGS = -Wall -Werror -std=c++11 -O2 CXXFLAGS = -Wall -Werror -std=c++11 -O2