1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-05-09 18:43:45 +00:00

Restructure audio source files (#2520)

* restructure audio files

* fix
This commit is contained in:
fig02 2025-05-01 18:14:53 -04:00 committed by GitHub
parent 3152557b49
commit ed15061de5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
20 changed files with 23 additions and 23 deletions

View file

@ -536,7 +536,7 @@ endif
$(BUILD_DIR)/src/boot/build.o: CPP_DEFINES += -DBUILD_CREATOR="\"$(BUILD_CREATOR)\"" -DBUILD_DATE="\"$(BUILD_DATE)\"" -DBUILD_TIME="\"$(BUILD_TIME)\""
$(BUILD_DIR)/src/audio/lib/seqplayer.o: CPP_DEFINES += -DMML_VERSION=MML_VERSION_OOT
$(BUILD_DIR)/src/audio/internal/seqplayer.o: CPP_DEFINES += -DMML_VERSION=MML_VERSION_OOT
ifeq ($(COMPILER),ido)
$(BUILD_DIR)/src/boot/driverominit.o: OPTFLAGS := -O2
@ -620,15 +620,15 @@ $(BUILD_DIR)/src/libu64/%.o: OPTFLAGS := -O2
$(BUILD_DIR)/src/audio/%.o: OPTFLAGS := -O2
# Use signed chars instead of unsigned for this audio file (needed to match AudioDebug_ScrPrt)
$(BUILD_DIR)/src/audio/general.o: CFLAGS += -signed
$(BUILD_DIR)/src/audio/game/general.o: CFLAGS += -signed
ifeq ($(PLATFORM),N64)
$(BUILD_DIR)/src/audio/general.o: CFLAGS += -DNO_SQRTF_INTRINSIC
$(BUILD_DIR)/src/audio/game/general.o: CFLAGS += -DNO_SQRTF_INTRINSIC
endif
# Put string literals in .data for some audio files (needed to match these files with literals)
$(BUILD_DIR)/src/audio/sfx.o: CFLAGS += -use_readwrite_const
$(BUILD_DIR)/src/audio/sequence.o: CFLAGS += -use_readwrite_const
$(BUILD_DIR)/src/audio/game/sfx.o: CFLAGS += -use_readwrite_const
$(BUILD_DIR)/src/audio/game/sequence.o: CFLAGS += -use_readwrite_const
ifeq ($(PLATFORM),IQUE)
$(BUILD_DIR)/src/libultra/%.o: CC := $(EGCS_CC)
@ -961,7 +961,7 @@ $(BUILD_DIR)/src/%.o: src/%.c
$(POSTPROCESS_OBJ) $@
$(OBJDUMP_CMD)
$(BUILD_DIR)/src/audio/session_init.o: src/audio/session_init.c $(BUILD_DIR)/assets/audio/soundfont_sizes.h $(BUILD_DIR)/assets/audio/sequence_sizes.h
$(BUILD_DIR)/src/audio/game/session_init.o: src/audio/game/session_init.c $(BUILD_DIR)/assets/audio/soundfont_sizes.h $(BUILD_DIR)/assets/audio/sequence_sizes.h
$(CC_CHECK) $< -o $@
$(CC) -c $(CFLAGS) $(MIPS_VERSION) $(OPTFLAGS) -o $(@:.o=.tmp) $<
$(LD) -r -T linker_scripts/data_with_rodata.ld -o $@ $(@:.o=.tmp)

View file

@ -676,31 +676,31 @@ beginseg
#if OOT_VERSION < NTSC_1_1 || !PLATFORM_N64
pad_text
#endif
include "$(BUILD_DIR)/src/audio/lib/data.o"
include "$(BUILD_DIR)/src/audio/lib/synthesis.o"
include "$(BUILD_DIR)/src/audio/lib/heap.o"
include "$(BUILD_DIR)/src/audio/lib/load.o"
include "$(BUILD_DIR)/src/audio/lib/thread.o"
include "$(BUILD_DIR)/src/audio/lib/dcache.o"
include "$(BUILD_DIR)/src/audio/lib/aisetnextbuf.o"
include "$(BUILD_DIR)/src/audio/internal/data.o"
include "$(BUILD_DIR)/src/audio/internal/synthesis.o"
include "$(BUILD_DIR)/src/audio/internal/heap.o"
include "$(BUILD_DIR)/src/audio/internal/load.o"
include "$(BUILD_DIR)/src/audio/internal/thread.o"
include "$(BUILD_DIR)/src/audio/internal/dcache.o"
include "$(BUILD_DIR)/src/audio/internal/aisetnextbuf.o"
#if OOT_PAL_N64
pad_text
pad_text
pad_text
#endif
include "$(BUILD_DIR)/src/audio/lib/playback.o"
include "$(BUILD_DIR)/src/audio/lib/effects.o"
include "$(BUILD_DIR)/src/audio/lib/seqplayer.o"
include "$(BUILD_DIR)/src/audio/general.o"
include "$(BUILD_DIR)/src/audio/internal/playback.o"
include "$(BUILD_DIR)/src/audio/internal/effects.o"
include "$(BUILD_DIR)/src/audio/internal/seqplayer.o"
include "$(BUILD_DIR)/src/audio/game/general.o"
#if !PLATFORM_N64 && !DEBUG_FEATURES
pad_text
#endif
include "$(BUILD_DIR)/src/audio/sfx_params.o"
include "$(BUILD_DIR)/src/audio/sfx.o"
include "$(BUILD_DIR)/src/audio/sequence.o"
include "$(BUILD_DIR)/src/audio/data.o"
include "$(BUILD_DIR)/src/audio/session_config.o"
include "$(BUILD_DIR)/src/audio/session_init.o"
include "$(BUILD_DIR)/src/audio/game/sfx_params.o"
include "$(BUILD_DIR)/src/audio/game/sfx.o"
include "$(BUILD_DIR)/src/audio/game/sequence.o"
include "$(BUILD_DIR)/src/audio/game/data.o"
include "$(BUILD_DIR)/src/audio/game/session_config.o"
include "$(BUILD_DIR)/src/audio/game/session_init.o"
// libu64
#if PLATFORM_N64