diff options
| author | luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> | 2020-12-16 21:24:44 -0500 |
|---|---|---|
| committer | luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> | 2020-12-16 21:24:44 -0500 |
| commit | 3d686116d8acb9f3daa1db9669de6eca11a861d5 (patch) | |
| tree | 6b85da1107d36ec37c33bbca7fd55a97d071db67 /berry_fix/payload | |
| parent | 5a5acfb0ada48c89d1e398dea3fd3ef701213b60 (diff) | |
[Round 3] Apply all source related changes for the new INSTALL.md in one commit.
Diffstat (limited to 'berry_fix/payload')
| -rw-r--r-- | berry_fix/payload/Makefile | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/berry_fix/payload/Makefile b/berry_fix/payload/Makefile index a121fda93..bae657c92 100644 --- a/berry_fix/payload/Makefile +++ b/berry_fix/payload/Makefile @@ -1,29 +1,28 @@ TOOLCHAIN := $(DEVKITARM) COMPARE ?= 0 -ifeq ($(CC),) -HOSTCC := gcc -else -HOSTCC := $(CC) +# don't use dkP's base_tools anymore +# because the redefinition of $(CC) conflicts +# with when we want to use $(CC) to preprocess files +# thus, manually create the variables for the bin +# files, or use arm-none-eabi binaries on the system +# if dkP is not installed on tihs system + +ifneq (,$(TOOLCHAIN)) +ifneq ($(wildcard $(TOOLCHAIN)/bin),) +export PATH := $(TOOLCHAIN)/bin:$(PATH) 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 +AS := $(PREFIX)as +CPP := $(CC) -E +LD := $(PREFIX)ld + +# note: the makefile must be set up so MODERNCC is never called +# if MODERN=0 +MODERNCC := $(PREFIX)gcc ifeq ($(OS),Windows_NT) EXE := .exe |