Rooba
/
pokeemerald
mirror of https://github.com/pret/pokeemerald.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix $(AR) define, remove \u warns on macOS.

This commit is contained in:
luckytyphlosion 2021-01-04 11:35:59 -05:00
parent e744d86bf1
commit 98f8c96c9e
4 changed files with 72 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Makefile
View File

@ -6,7 +6,7 @@ COMPARE ?= 0
# with when we want to use $(CC) to preprocess files # with when we want to use $(CC) to preprocess files
# thus, manually create the variables for the bin # thus, manually create the variables for the bin
# files, or use arm-none-eabi binaries on the system # files, or use arm-none-eabi binaries on the system
# if dkP is not installed on tihs system # if dkP is not installed on this system
ifneq (,$(TOOLCHAIN)) ifneq (,$(TOOLCHAIN))
ifneq ($(wildcard $(TOOLCHAIN)/bin),) ifneq ($(wildcard $(TOOLCHAIN)/bin),)
@ -36,10 +36,21 @@ MAKER_CODE := 01
REVISION := 0 REVISION := 0
MODERN ?= 0 MODERN ?= 0
# use arm-none-eabi-cpp for macOS
# as macOS's default compiler is clang
# and clang's preprocessor will warn on \u
# when preprocessing asm files, expecting a unicode literal
# we can't unconditionally use arm-none-eabi-cpp
# as installations which install binutils-arm-none-eabi
# don't come with it
ifneq ($(MODERN),1) ifneq ($(MODERN),1)
CPP := $(CC) -E ifeq ($(shell uname -s),Darwin)
CPP := $(PREFIX)cpp
else
CPP := $(CC) -E
endif
else else
CPP := $(PREFIX)cpp CPP := $(PREFIX)cpp
endif endif
ROM_NAME := pokeemerald.gba ROM_NAME := pokeemerald.gba
@ -362,7 +373,7 @@ modern: ; @$(MAKE) MODERN=1
berry_fix/berry_fix.gba: berry_fix berry_fix/berry_fix.gba: berry_fix
berry_fix: berry_fix:
@$(MAKE) -C berry_fix COMPARE=$(COMPARE) TOOLCHAIN=$(TOOLCHAIN) @$(MAKE) -C berry_fix COMPARE=$(COMPARE) TOOLCHAIN=$(TOOLCHAIN) MODERN=$(MODERN)
libagbsyscall: libagbsyscall:
@$(MAKE) -C libagbsyscall TOOLCHAIN=$(TOOLCHAIN) @$(MAKE) -C libagbsyscall TOOLCHAIN=$(TOOLCHAIN) MODERN=$(MODERN)

22
berry_fix/Makefile
View File

@ -6,7 +6,7 @@ COMPARE ?= 0
# with when we want to use $(CC) to preprocess files # with when we want to use $(CC) to preprocess files
# thus, manually create the variables for the bin # thus, manually create the variables for the bin
# files, or use arm-none-eabi binaries on the system # files, or use arm-none-eabi binaries on the system
# if dkP is not installed on tihs system # if dkP is not installed on this system
ifneq (,$(TOOLCHAIN)) ifneq (,$(TOOLCHAIN))
ifneq ($(wildcard $(TOOLCHAIN)/bin),) ifneq ($(wildcard $(TOOLCHAIN)/bin),)
@ -17,7 +17,6 @@ endif
PREFIX := arm-none-eabi- PREFIX := arm-none-eabi-
OBJCOPY := $(PREFIX)objcopy OBJCOPY := $(PREFIX)objcopy
AS := $(PREFIX)as AS := $(PREFIX)as
CPP := $(CC) -E
LD := $(PREFIX)ld LD := $(PREFIX)ld
# note: the makefile must be set up so MODERNCC is never called # note: the makefile must be set up so MODERNCC is never called
@ -30,6 +29,23 @@ else
EXE := EXE :=
endif endif
# use arm-none-eabi-cpp for macOS
# as macOS's default compiler is clang
# and clang's preprocessor will warn on \u
# when preprocessing asm files, expecting a unicode literal
# we can't unconditionally use arm-none-eabi-cpp
# as installations which install binutils-arm-none-eabi
# don't come with it
ifneq ($(MODERN),1)
ifeq ($(shell uname -s),Darwin)
CPP := $(PREFIX)cpp
else
CPP := $(CC) -E
endif
else
CPP := $(PREFIX)cpp
endif
GAME_CODE := AGBJ GAME_CODE := AGBJ
MAKER_CODE := 01 MAKER_CODE := 01
REVISION := 0 REVISION := 0
@ -165,7 +181,7 @@ $(DATA_ASM_BUILDDIR)/%.o: data_dep = $(shell $(SCANINC) $(DATA_ASM_SUBDIR)/$*.s)
endif endif
payload: payload:
@$(MAKE) -C payload COMPARE=$(COMPARE) TOOLCHAIN=$(TOOLCHAIN) @$(MAKE) -C payload COMPARE=$(COMPARE) TOOLCHAIN=$(TOOLCHAIN) MODERN=$(MODERN)
payload/payload.gba: payload payload/payload.gba: payload

20
berry_fix/payload/Makefile
View File

@ -6,7 +6,7 @@ COMPARE ?= 0
# with when we want to use $(CC) to preprocess files # with when we want to use $(CC) to preprocess files
# thus, manually create the variables for the bin # thus, manually create the variables for the bin
# files, or use arm-none-eabi binaries on the system # files, or use arm-none-eabi binaries on the system
# if dkP is not installed on tihs system # if dkP is not installed on this system
ifneq (,$(TOOLCHAIN)) ifneq (,$(TOOLCHAIN))
ifneq ($(wildcard $(TOOLCHAIN)/bin),) ifneq ($(wildcard $(TOOLCHAIN)/bin),)
@ -17,7 +17,6 @@ endif
PREFIX := arm-none-eabi- PREFIX := arm-none-eabi-
OBJCOPY := $(PREFIX)objcopy OBJCOPY := $(PREFIX)objcopy
AS := $(PREFIX)as AS := $(PREFIX)as
CPP := $(CC) -E
LD := $(PREFIX)ld LD := $(PREFIX)ld
# note: the makefile must be set up so MODERNCC is never called # note: the makefile must be set up so MODERNCC is never called
@ -30,6 +29,23 @@ else
EXE := EXE :=
endif endif
# use arm-none-eabi-cpp for macOS
# as macOS's default compiler is clang
# and clang's preprocessor will warn on \u
# when preprocessing asm files, expecting a unicode literal
# we can't unconditionally use arm-none-eabi-cpp
# as installations which install binutils-arm-none-eabi
# don't come with it
ifneq ($(MODERN),1)
ifeq ($(shell uname -s),Darwin)
CPP := $(PREFIX)cpp
else
CPP := $(CC) -E
endif
else
CPP := $(PREFIX)cpp
endif
SHELL := /bin/bash -o pipefail SHELL := /bin/bash -o pipefail
CPPFLAGS := -I ../../tools/agbcc/include -I ../../tools/agbcc -iquote include -nostdinc -undef CPPFLAGS := -I ../../tools/agbcc/include -I ../../tools/agbcc -iquote include -nostdinc -undef

21
libagbsyscall/Makefile
View File

@ -6,7 +6,7 @@ COMPARE ?= 0
# with when we want to use $(CC) to preprocess files # with when we want to use $(CC) to preprocess files
# thus, manually create the variables for the bin # thus, manually create the variables for the bin
# files, or use arm-none-eabi binaries on the system # files, or use arm-none-eabi binaries on the system
# if dkP is not installed on tihs system # if dkP is not installed on this system
ifneq (,$(TOOLCHAIN)) ifneq (,$(TOOLCHAIN))
ifneq ($(wildcard $(TOOLCHAIN)/bin),) ifneq ($(wildcard $(TOOLCHAIN)/bin),)
@ -17,8 +17,8 @@ endif
PREFIX := arm-none-eabi- PREFIX := arm-none-eabi-
OBJCOPY := $(PREFIX)objcopy OBJCOPY := $(PREFIX)objcopy
AS := $(PREFIX)as AS := $(PREFIX)as
CPP := $(CC) -E
LD := $(PREFIX)ld LD := $(PREFIX)ld
AR := $(PREFIX)ar
# note: the makefile must be set up so MODERNCC is never called # note: the makefile must be set up so MODERNCC is never called
# if MODERN=0 # if MODERN=0
@ -30,6 +30,23 @@ else
EXE := EXE :=
endif endif
# use arm-none-eabi-cpp for macOS
# as macOS's default compiler is clang
# and clang's preprocessor will warn on \u
# when preprocessing asm files, expecting a unicode literal
# we can't unconditionally use arm-none-eabi-cpp
# as installations which install binutils-arm-none-eabi
# don't come with it
ifneq ($(MODERN),1)
ifeq ($(shell uname -s),Darwin)
CPP := $(PREFIX)cpp
else
CPP := $(CC) -E
endif
else
CPP := $(PREFIX)cpp
endif
ASFLAGS := -mcpu=arm7tdmi ASFLAGS := -mcpu=arm7tdmi
ARFLAGS := rc ARFLAGS := rc