Skip to content

Commit d598891

Browse files
committed
Merge "Revert "Merge 'Enable -Wall and "fix" warnings' (#2474)"" (#2489)
# Conflicts: # ASM/build/asm_symbols.txt # ASM/build/bundle.o # ASM/build/c_symbols.txt # data/generated/patch_symbols.json # data/generated/rom_patch.txt # data/generated/symbols.json
2 parents cf9c9f9 + 312ec10 commit d598891

36 files changed

Lines changed: 38826 additions & 39006 deletions

ASM/Makefile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@ LD = $(MIPS_BINUTILS_PREFIX)ld
44
OBJDUMP = $(MIPS_BINUTILS_PREFIX)objdump
55
OBJCOPY = $(MIPS_BINUTILS_PREFIX)objcopy
66

7-
CFLAGS = -O1 -G0 -fno-reorder-blocks \
8-
-march=vr4300 -mtune=vr4300 -mabi=32 -mno-gpopt -mdivide-breaks -mexplicit-relocs \
9-
-Wall
7+
CFLAGS = -O1 -G0 -fno-reorder-blocks -march=vr4300 -mtune=vr4300 -mabi=32 -mno-gpopt -mdivide-breaks \
8+
-mexplicit-relocs
109
CPPFLAGS = -DF3DEX_GBI_2
1110

1211
OUTDIR := build

0 commit comments

Comments
 (0)