1
0
mirror of https://github.com/zeldaret/oot.git synced 2024-09-21 04:24:43 +00:00

Reorganize Audio Files & Name Remaining Audio Files (#1494)

* reorganize audio files

* audio code files

* split audio and libaudio

* audio_init_params to audio_configuration

* simplify file names

* move aisetnextbuf to libaudio

* move src/audio -> src/code/audio

* adjust makefile comment

* reorganize again into internal/external

* adjust comment

* restructure again
This commit is contained in:
engineer124 2023-07-07 07:55:10 +10:00 committed by GitHub
parent 0ce0313342
commit d307a37233
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
20 changed files with 24 additions and 22 deletions

View File

@ -199,12 +199,14 @@ build/src/code/fmodf.o: OPTFLAGS := -g
build/src/code/__osMemset.o: OPTFLAGS := -g
build/src/code/__osMemmove.o: OPTFLAGS := -g
# Use signed chars instead of unsigned for code_800EC960.c (needed to match AudioDebug_ScrPrt)
build/src/code/code_800EC960.o: CFLAGS += -signed
build/src/audio/%.o: OPTFLAGS := -O2
# Use signed chars instead of unsigned for this audio file (needed to match AudioDebug_ScrPrt)
build/src/audio/general.o: CFLAGS += -signed
# Put string literals in .data for some audio files (needed to match these files with literals)
build/src/code/code_800F7260.o: CFLAGS += -use_readwrite_const
build/src/code/code_800F9280.o: CFLAGS += -use_readwrite_const
build/src/audio/sfx.o: CFLAGS += -use_readwrite_const
build/src/audio/sequence.o: CFLAGS += -use_readwrite_const
build/src/libultra/libc/absf.o: OPTFLAGS := -O2 -g3
build/src/libultra/libc/sqrt.o: OPTFLAGS := -O2 -g3

36
spec
View File

@ -387,8 +387,8 @@ beginseg
include "build/src/code/PreRender.o"
include "build/src/code/TwoHeadGfxArena.o"
include "build/src/code/TwoHeadArena.o"
include "build/src/code/code_800C3C20.o"
include "build/src/code/audioMgr.o"
include "build/src/code/audio_stop_all_sfx.o"
include "build/src/code/audio_thread_manager.o"
include "build/src/code/title_setup.o"
include "build/src/code/game.o"
include "build/src/code/gamealloc.o"
@ -417,22 +417,22 @@ beginseg
include "build/src/code/kanread.o"
include "build/src/code/ucode_disas.o"
pad_text // audio library aligned to 32 bytes?
include "build/src/code/audio_data.o"
include "build/src/code/audio_synthesis.o"
include "build/src/code/audio_heap.o"
include "build/src/code/audio_load.o"
include "build/src/code/code_800E4FE0.o"
include "build/src/code/code_800E6840.o"
include "build/src/libultra/io/aisetnextbuf.o"
include "build/src/code/audio_playback.o"
include "build/src/code/audio_effects.o"
include "build/src/code/audio_seqplayer.o"
include "build/src/code/code_800EC960.o"
include "build/src/code/audio_sfx_params.o"
include "build/src/code/code_800F7260.o"
include "build/src/code/code_800F9280.o"
include "build/src/code/audio_external_data.o"
include "build/src/code/audio_init_params.o"
include "build/src/audio/lib/data.o"
include "build/src/audio/lib/synthesis.o"
include "build/src/audio/lib/heap.o"
include "build/src/audio/lib/load.o"
include "build/src/audio/lib/thread.o"
include "build/src/audio/lib/dcache.o"
include "build/src/audio/lib/aisetnextbuf.o"
include "build/src/audio/lib/playback.o"
include "build/src/audio/lib/effects.o"
include "build/src/audio/lib/seqplayer.o"
include "build/src/audio/general.o"
include "build/src/audio/sfx_params.o"
include "build/src/audio/sfx.o"
include "build/src/audio/sequence.o"
include "build/src/audio/data.o"
include "build/src/audio/session_config.o"
include "build/src/code/logseverity.o"
include "build/src/code/gfxprint.o"
include "build/src/code/rcp_utils.o"