From 98ea63ce9fc3e15ae1376fb28df76360baee4267 Mon Sep 17 00:00:00 2001 From: engineer124 Date: Thu, 11 Nov 2021 13:54:59 +1100 Subject: [PATCH] Use proper flags for voice files --- Makefile | 3 +++ spec | 4 ++-- src/code/{ => audio}/code_801A4EB0.c | 0 src/code/{ => audio}/code_801A51F0.c | 0 4 files changed, 5 insertions(+), 2 deletions(-) rename src/code/{ => audio}/code_801A4EB0.c (100%) rename src/code/{ => audio}/code_801A51F0.c (100%) diff --git a/Makefile b/Makefile index b202b95c0..470d835d4 100644 --- a/Makefile +++ b/Makefile @@ -156,6 +156,8 @@ build/src/libultra/rmon/%.o: OPTFLAGS := -O2 build/src/libultra/flash/%.o: OPTFLAGS := -g build/src/libultra/flash/%.o: MIPS_VERSION := -mips1 +build/src/code/audio/%.o: OPTFLAGS := -O2 + # file flags build/src/boot_O2_g3/fault.o: CFLAGS += -trapuv build/src/boot_O2_g3/fault_drawer.o: CFLAGS += -trapuv @@ -172,6 +174,7 @@ build/src/boot_O2_g3/%.o: CC := python3 tools/asm-processor/build.py $(CC) -- $( build/src/libultra/%.o: CC := python3 tools/asm-processor/build.py $(CC_OLD) -- $(AS) $(ASFLAGS) -- build/src/code/%.o: CC := python3 tools/asm-processor/build.py $(CC) -- $(AS) $(ASFLAGS) -- +build/src/code/audio%.o: CC := python3 tools/asm-processor/build.py $(CC) -- $(AS) $(ASFLAGS) -- build/src/overlays/actors/%.o: CC := python3 tools/asm-processor/build.py $(CC) -- $(AS) $(ASFLAGS) -- build/src/overlays/effects/%.o: CC := python3 tools/asm-processor/build.py $(CC) -- $(AS) $(ASFLAGS) -- diff --git a/spec b/spec index c54036abb..36da46954 100644 --- a/spec +++ b/spec @@ -658,8 +658,8 @@ beginseg include "build/src/code/code_8019AF00.o" include "build/data/code/code_8019AF00.bss.o" include "build/data/code/code_801D55B0.data.o" - include "build/src/code/code_801A4EB0.o" - include "build/src/code/code_801A51F0.o" + include "build/src/code/audio/code_801A4EB0.o" + include "build/src/code/audio/code_801A51F0.o" include "build/data/code/code_801A51F0.data.o" include "build/data/code/code_801A51F0.bss.o" pad_text diff --git a/src/code/code_801A4EB0.c b/src/code/audio/code_801A4EB0.c similarity index 100% rename from src/code/code_801A4EB0.c rename to src/code/audio/code_801A4EB0.c diff --git a/src/code/code_801A51F0.c b/src/code/audio/code_801A51F0.c similarity index 100% rename from src/code/code_801A51F0.c rename to src/code/audio/code_801A51F0.c