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

Don't use base_tools if dkP is installed, also just use $(CC) -E for CPP regardless.

Browse Source
This commit is contained in:
luckytyphlosion 2020-11-25 10:37:50 -05:00
parent 1536295872
commit 51e8b8b8db
4 changed files with 69 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
Makefile
View File

@ -1,29 +1,26 @@
TOOLCHAIN := $(DEVKITARM) TOOLCHAIN := $(DEVKITARM)
COMPARE ?= 0 COMPARE ?= 0
# check if dkP's base_tools makefile exists # don't use dkP's base_tools anymore
ifneq (,$(wildcard $(TOOLCHAIN)/base_tools)) # because the redefinition of $(CC) conflicts
include $(TOOLCHAIN)/base_tools # with when we want to use $(CC) to preprocess files
# otherwise, either use the bin files or the # thus, manually create the variables for the bin
# arm-none-eabi binaries on the system # files, or use arm-none-eabi binaries on the system
else # if dkP is not installed on tihs system
ifneq ($(TOOLCHAIN),)
export PATH := $(TOOLCHAIN)/bin:$(PATH)
endif
PREFIX := arm-none-eabi-
OBJCOPY := $(PREFIX)objcopy
# note: the makefile must be set up so MODERNCC is never called
# if MODERN=0
export MODERNCC := $(PREFIX)gcc
export AS := $(PREFIX)as
endif
ifneq ($(TOOLCHAIN),) ifneq ($(TOOLCHAIN),)
export CPP := $(PREFIX)cpp export PATH := $(TOOLCHAIN)/bin:$(PATH)
else
export CPP := $(CC) -E
endif endif
export LD := $(PREFIX)ld
PREFIX := arm-none-eabi-
OBJCOPY := $(PREFIX)objcopy
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) ifeq ($(OS),Windows_NT)
EXE := .exe EXE := .exe

35
berry_fix/Makefile
View File

@ -1,27 +1,26 @@
TOOLCHAIN := $(DEVKITARM) TOOLCHAIN := $(DEVKITARM)
COMPARE ?= 0 COMPARE ?= 0
# check if dkP's base_tools makefile exists # don't use dkP's base_tools anymore
ifneq (,$(wildcard $(TOOLCHAIN)/base_tools)) # because the redefinition of $(CC) conflicts
include $(TOOLCHAIN)/base_tools # with when we want to use $(CC) to preprocess files
# otherwise, either use the bin files or the # thus, manually create the variables for the bin
# arm-none-eabi binaries on the system # files, or use arm-none-eabi binaries on the system
else # if dkP is not installed on tihs system
ifneq ($(TOOLCHAIN),)
export PATH := $(TOOLCHAIN)/bin:$(PATH)
endif
PREFIX := arm-none-eabi-
OBJCOPY := $(PREFIX)objcopy
export MODERNCC := $(PREFIX)gcc
export AS := $(PREFIX)as
endif
ifneq ($(TOOLCHAIN),) ifneq ($(TOOLCHAIN),)
export CPP := $(PREFIX)cpp export PATH := $(TOOLCHAIN)/bin:$(PATH)
else
export CPP := $(CC) -E
endif endif
export LD := $(PREFIX)ld
PREFIX := arm-none-eabi-
OBJCOPY := $(PREFIX)objcopy
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) ifeq ($(OS),Windows_NT)
EXE := .exe EXE := .exe

35
berry_fix/payload/Makefile
View File

@ -1,27 +1,26 @@
TOOLCHAIN := $(DEVKITARM) TOOLCHAIN := $(DEVKITARM)
COMPARE ?= 0 COMPARE ?= 0
# check if dkP's base_tools makefile exists # don't use dkP's base_tools anymore
ifneq (,$(wildcard $(TOOLCHAIN)/base_tools)) # because the redefinition of $(CC) conflicts
include $(TOOLCHAIN)/base_tools # with when we want to use $(CC) to preprocess files
# otherwise, either use the bin files or the # thus, manually create the variables for the bin
# arm-none-eabi binaries on the system # files, or use arm-none-eabi binaries on the system
else # if dkP is not installed on tihs system
ifneq ($(TOOLCHAIN),)
export PATH := $(TOOLCHAIN)/bin:$(PATH)
endif
PREFIX := arm-none-eabi-
OBJCOPY := $(PREFIX)objcopy
export MODERNCC := $(PREFIX)gcc
export AS := $(PREFIX)as
endif
ifneq ($(TOOLCHAIN),) ifneq ($(TOOLCHAIN),)
export CPP := $(PREFIX)cpp export PATH := $(TOOLCHAIN)/bin:$(PATH)
else
export CPP := $(CC) -E
endif endif
export LD := $(PREFIX)ld
PREFIX := arm-none-eabi-
OBJCOPY := $(PREFIX)objcopy
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) ifeq ($(OS),Windows_NT)
EXE := .exe EXE := .exe

36
libagbsyscall/Makefile
View File

@ -1,27 +1,27 @@
TOOLCHAIN := $(DEVKITARM) TOOLCHAIN := $(DEVKITARM)
COMPARE ?= 0 COMPARE ?= 0
# check if dkP's base_tools makefile exists # don't use dkP's base_tools anymore
ifneq (,$(wildcard $(TOOLCHAIN)/base_tools)) # because the redefinition of $(CC) conflicts
include $(TOOLCHAIN)/base_tools # with when we want to use $(CC) to preprocess files
# otherwise, either use the bin files or the # thus, manually create the variables for the bin
# arm-none-eabi binaries on the system # files, or use arm-none-eabi binaries on the system
else # if dkP is not installed on tihs system
ifneq ($(TOOLCHAIN),)
export PATH := $(TOOLCHAIN)/bin:$(PATH)
endif
PREFIX := arm-none-eabi-
OBJCOPY := $(PREFIX)objcopy
export MODERNCC := $(PREFIX)gcc
export AS := $(PREFIX)as
endif
ifneq ($(TOOLCHAIN),) ifneq ($(TOOLCHAIN),)
export CPP := $(PREFIX)cpp export PATH := $(TOOLCHAIN)/bin:$(PATH)
else
export CPP := $(CC) -E
endif endif
export LD := $(PREFIX)ld
PREFIX := arm-none-eabi-
OBJCOPY := $(PREFIX)objcopy
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) ifeq ($(OS),Windows_NT)
EXE := .exe EXE := .exe
else else