mirror of
https://github.com/Ninjdai1/pokeemerald.git
synced 2024-12-26 03:34:15 +01:00
Reverted -nostdlib changes
This commit is contained in:
parent
bb5da949f2
commit
6fb1d55c33
2
Makefile
2
Makefile
@ -69,7 +69,7 @@ OBJ_DIR := build/emerald
|
||||
LIBPATH := -L ../../tools/agbcc/lib
|
||||
else
|
||||
CC1 = $(shell $(CC) --print-prog-name=cc1) -quiet
|
||||
override CFLAGS += -mthumb -mthumb-interwork -O2 -mabi=apcs-gnu -mtune=arm7tdmi -march=armv4t -fno-toplevel-reorder -Wno-pointer-to-int-cast
|
||||
override CFLAGS += -mthumb -mthumb-interwork -O2 -mabi=apcs-gnu -mcpu=arm7tdmi -fno-toplevel-reorder -Wno-pointer-to-int-cast
|
||||
ROM := pokeemerald_modern.gba
|
||||
OBJ_DIR := build/modern
|
||||
LIBPATH := -L "$(dir $(shell $(CC) -mthumb -print-file-name=libgcc.a))" -L "$(dir $(shell $(CC) -mthumb -print-file-name=libc.a))"
|
||||
|
@ -42,7 +42,7 @@ CPPFLAGS := -I ../tools/agbcc/include -I ../tools/agbcc -iquote include -nostdin
|
||||
ROM := berry_fix.gba
|
||||
OBJ_DIR := build
|
||||
CC1 := ../tools/agbcc/bin/agbcc$(EXE)
|
||||
override CFLAGS += -mthumb-interwork -Wimplicit -Wparentheses -Werror -O2 -fhex-asm -nostdlib
|
||||
override CFLAGS += -mthumb-interwork -Wimplicit -Wparentheses -Werror -O2 -fhex-asm
|
||||
|
||||
|
||||
ELF = $(ROM:.gba=.elf)
|
||||
@ -56,7 +56,7 @@ C_BUILDDIR = $(OBJ_DIR)/$(C_SUBDIR)
|
||||
ASM_BUILDDIR = $(OBJ_DIR)/$(ASM_SUBDIR)
|
||||
DATA_ASM_BUILDDIR = $(OBJ_DIR)/$(DATA_ASM_SUBDIR)
|
||||
|
||||
ASFLAGS := -mcpu=arm7tdmi -mthumb-interwork
|
||||
ASFLAGS := -mcpu=arm7tdmi
|
||||
|
||||
LDFLAGS = -Map ../$(MAP)
|
||||
|
||||
|
@ -52,7 +52,7 @@ C_BUILDDIR = $(OBJ_DIR)/$(C_SUBDIR)
|
||||
ASM_BUILDDIR = $(OBJ_DIR)/$(ASM_SUBDIR)
|
||||
DATA_ASM_BUILDDIR = $(OBJ_DIR)/$(DATA_ASM_SUBDIR)
|
||||
|
||||
ASFLAGS := -mcpu=arm7tdmi -mthumb-interwork
|
||||
ASFLAGS := -mcpu=arm7tdmi
|
||||
|
||||
LDFLAGS = -Map ../$(MAP)
|
||||
|
||||
|
@ -31,7 +31,7 @@ else
|
||||
EXE :=
|
||||
endif
|
||||
|
||||
ASFLAGS := -mcpu=arm7tdmi -mthumb-interwork
|
||||
ASFLAGS := -mcpu=arm7tdmi
|
||||
ARFLAGS := rc
|
||||
|
||||
SYSCALLS := IntrWait \
|
||||
|
Loading…
Reference in New Issue
Block a user