diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-10-02 12:40:00 -0400 |
|---|---|---|
| committer | GriffinR <griffin.richards@comcast.net> | 2019-10-02 12:40:00 -0400 |
| commit | 2ac3ad3e607c0c54d28223825b39b9e695022b5c (patch) | |
| tree | 3bff8424909b1038b72ca4b310f12f9e0835088b /berry_fix | |
| parent | 67152b92424419a470ed2bb0cf5e5f8a8ced38de (diff) | |
| parent | cb528cb543ab98a58ba2b5a78524c3542ed80f62 (diff) | |
Review changes for #819 and merge
Diffstat (limited to 'berry_fix')
| -rw-r--r-- | berry_fix/Makefile | 28 | ||||
| -rw-r--r-- | berry_fix/payload/Makefile | 26 |
2 files changed, 49 insertions, 5 deletions
diff --git a/berry_fix/Makefile b/berry_fix/Makefile index 2bc225eba..0ead3804f 100644 --- a/berry_fix/Makefile +++ b/berry_fix/Makefile @@ -1,7 +1,29 @@ -include $(DEVKITARM)/base_tools +TOOLCHAIN := $(DEVKITARM) +COMPARE ?= 0 + +ifeq ($(CC),) +HOSTCC := gcc +else +HOSTCC := $(CC) +endif + +ifeq ($(CXX),) +HOSTCXX := g++ +else +HOSTCXX := $(CXX) +endif + +ifneq (,$(wildcard $(TOOLCHAIN)/base_tools)) +include $(TOOLCHAIN)/base_tools +else +export PATH := $(TOOLCHAIN)/bin:$(PATH) +PREFIX := arm-none-eabi- +OBJCOPY := $(PREFIX)objcopy +export CC := $(PREFIX)gcc +export AS := $(PREFIX)as +endif export CPP := $(PREFIX)cpp export LD := $(PREFIX)ld -COMPARE ?= 0 ifeq ($(OS),Windows_NT) EXE := .exe @@ -144,7 +166,7 @@ $(DATA_ASM_BUILDDIR)/%.o: data_dep = $(shell $(SCANINC) $(DATA_ASM_SUBDIR)/$*.s) endif payload: - @$(MAKE) -C payload COMPARE=$(COMPARE) + @$(MAKE) -C payload COMPARE=$(COMPARE) TOOLCHAIN=$(TOOLCHAIN) payload/payload.gba: payload diff --git a/berry_fix/payload/Makefile b/berry_fix/payload/Makefile index 63e326724..a121fda93 100644 --- a/berry_fix/payload/Makefile +++ b/berry_fix/payload/Makefile @@ -1,7 +1,29 @@ -include $(DEVKITARM)/base_tools +TOOLCHAIN := $(DEVKITARM) +COMPARE ?= 0 + +ifeq ($(CC),) +HOSTCC := gcc +else +HOSTCC := $(CC) +endif + +ifeq ($(CXX),) +HOSTCXX := g++ +else +HOSTCXX := $(CXX) +endif + +ifneq (,$(wildcard $(TOOLCHAIN)/base_tools)) +include $(TOOLCHAIN)/base_tools +else +export PATH := $(TOOLCHAIN)/bin:$(PATH) +PREFIX := arm-none-eabi- +OBJCOPY := $(PREFIX)objcopy +export CC := $(PREFIX)gcc +export AS := $(PREFIX)as +endif export CPP := $(PREFIX)cpp export LD := $(PREFIX)ld -COMPARE ?= 0 ifeq ($(OS),Windows_NT) EXE := .exe |