Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 30 additions & 30 deletions config/GGVE78/splits.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1333,85 +1333,85 @@ MWTrace.c:
MWCriticalSection_gc.cpp:
.text start:0x802B9814 end:0x802B986C

fmusic.c:
FMOD/src/fmusic.c:
.text start:0x802B986C end:0x802BA764
.rodata start:0x8037F010 end:0x8037F020
.sdata2 start:0x804B4818 end:0x804B4830

format_fsb.c:
FMOD/src/format_fsb.c:
.text start:0x802BA764 end:0x802BBCDC
.rodata start:0x8037F020 end:0x8037F030
.sdata2 start:0x804B4830 end:0x804B4840

format_gcadpcm.c:
FMOD/src/format_gcadpcm.c:
.text start:0x802BBCDC end:0x802BC18C
.rodata start:0x8037F030 end:0x8037F048

fsound.c:
FMOD/src/fsound.c:
.text start:0x802BC18C end:0x802BCF50
.rodata start:0x8037F048 end:0x8037F070
.sdata start:0x804B05A8 end:0x804B05B0
.sbss start:0x804B1C70 end:0x804B1C80
.sdata2 start:0x804B4840 end:0x804B4850

fsound_3d.c:
FMOD/src/fsound_3d.c:
.text start:0x802BCF50 end:0x802BD3A4
.data start:0x803BAE58 end:0x803BAF78
.sdata start:0x804B05B0 end:0x804B05C0
.sbss start:0x804B1C80 end:0x804B1C88
.sdata2 start:0x804B4850 end:0x804B4858

fsound_device.c:
FMOD/src/fsound_device.c:
.data start:0x803BAF78 end:0x803BB258

fsound_async.c:
FMOD/src/fsound_async.c:
.text start:0x802BD3A4 end:0x802BD70C
.bss start:0x80464E38 end:0x80468E38

fsound_channel.c:
FMOD/src/fsound_channel.c:
.text start:0x802BD70C end:0x802C14B8
.rodata start:0x8037F070 end:0x8037F100
.sdata2 start:0x804B4858 end:0x804B4870

fsound_dsp.c:
FMOD/src/fsound_dsp.c:
.text start:0x802C14B8 end:0x802C184C
.rodata start:0x8037F100 end:0x8037F110

fsound_gc.c:
FMOD/src/fsound_gc.c:
.text start:0x802C184C end:0x802C1F88
.rodata start:0x8037F110 end:0x8037F120
.data start:0x803BB258 end:0x803BB658
.sbss start:0x804B1C88 end:0x804B1C90

fsound_sample.c:
FMOD/src/fsound_sample.c:
.text start:0x802C1F88 end:0x802C4670
.rodata start:0x8037F120 end:0x8037F140
.sdata2 start:0x804B4870 end:0x804B4880

fsound_stream.c:
FMOD/src/fsound_stream.c:
.text start:0x802C4670 end:0x802C89AC
.rodata start:0x8037F140 end:0x8037F1A0
.sdata start:0x804B05C0 end:0x804B05C8
.sbss start:0x804B1C90 end:0x804B1C98
.sdata2 start:0x804B4880 end:0x804B48B8
.sbss2 start:0x804B5190 end:0x804B5198

mixer.c:
FMOD/src/mixer.c:
.rodata start:0x8037F1A0 end:0x8037F308
.data start:0x803BB658 end:0x803BB930

fsound_stream_decode.c:
FMOD/src/fsound_stream_decode.c:
.text start:0x802C89AC end:0x802C8DB8

mixer_clipcopy.c:
FMOD/src/mixer_clipcopy.c:
.text start:0x802C8DB8 end:0x802C9178

music_formatfsb.c:
FMOD/src/music_formatfsb.c:
.text start:0x802C9178 end:0x802C9BCC
.rodata start:0x8037F308 end:0x8037F330
.sdata start:0x804B05C8 end:0x804B05D0

output_gc.c:
FMOD/src/output_gc.c:
.text start:0x802C9BCC end:0x802CCD74
.rodata start:0x8037F330 end:0x8037F428
.data start:0x803BB930 end:0x803BB990
Expand All @@ -1420,51 +1420,51 @@ output_gc.c:
.sbss start:0x804B1C98 end:0x804B1CF0
.sdata2 start:0x804B48B8 end:0x804B48D0

output_nosound.c:
FMOD/src/output_nosound.c:
.text start:0x802CCD74 end:0x802CD288
.rodata start:0x8037F428 end:0x8037F438
.data start:0x803BB990 end:0x803BBA48
.sdata2 start:0x804B48D0 end:0x804B48D8

sound_software.c:
FMOD/src/sound_software.c:
.text start:0x802CD288 end:0x802CFD64
.rodata start:0x8037F438 end:0x8037F450
.data start:0x803BBA48 end:0x803BBB48
.sbss start:0x804B1CF0 end:0x804B1CF8
.sdata2 start:0x804B48D8 end:0x804B4928

sound_software_3d.c:
FMOD/src/sound_software_3d.c:
.text start:0x802CFD64 end:0x802D059C
.sdata2 start:0x804B4928 end:0x804B4960

system_file.c:
FMOD/src/system_file.c:
.text start:0x802D059C end:0x802D13BC
.rodata start:0x8037F450 end:0x8037F460
.bss start:0x80468F58 end:0x80469658
.sdata start:0x804B05D8 end:0x804B05E0
.sbss start:0x804B1CF8 end:0x804B1D20
.sdata2 start:0x804B4960 end:0x804B4968

system_memory.c:
FMOD/src/system_memory.c:
.text start:0x802D13BC end:0x802D1EE0
.rodata start:0x8037F460 end:0x8037F470

system_misc_gc.c:
FMOD/src/system_misc_gc.c:
.text start:0x802D1EE0 end:0x802D2DB0
.rodata start:0x8037F470 end:0x8037F4A8
.data start:0x803BBB48 end:0x803BBBB0
.sdata start:0x804B05E0 end:0x804B05E8
.sbss start:0x804B1D20 end:0x804B1D28

system_thread.c:
FMOD/src/system_thread.c:
.text start:0x802D2DB0 end:0x802D3264
.rodata start:0x8037F4A8 end:0x8037F4B8

system_time.c:
FMOD/src/system_time.c:
.text start:0x802D3264 end:0x802D3520
.sdata2 start:0x804B4968 end:0x804B4988

system_string.c:
FMOD/src/system_string.c:
.text start:0x802D3520 end:0x802D3754

dolphin/src/ai/ai.c:
Expand Down Expand Up @@ -1916,14 +1916,14 @@ OdemuExi2/DebuggerDriver.c:
.sdata start:0x804B0750 end:0x804B0758
.sbss start:0x804B2180 end:0x804B2198

ctdata.c:
rwsdk/plugin/rpcollis/ctdata.c:
.text start:0x8030088C end:0x803011A4

colldata.c:
rwsdk/plugin/rpcollis/colldata.c:
.text start:0x803011A4 end:0x80301604
.sbss start:0x804B2198 end:0x804B21B0

collquery.c:
rwsdk/plugin/rpcollis/collquery.c:
.text start:0x80301604 end:0x803036D0
.sdata2 start:0x804B4B18 end:0x804B4B30

Expand Down Expand Up @@ -2300,7 +2300,7 @@ rwsdk/src/plcore/bavector.c:
rwsdk/src/plcore/resmem.c:
.text start:0x80340DE0 end:0x80341020

rwgrp.c:
rwsdk/src/plcore/rwgrp.c:
.text start:0x80341020 end:0x80341100
.bss start:0x80486C50 end:0x80486C78
.sdata start:0x804B0818 end:0x804B0820
Expand Down
44 changes: 40 additions & 4 deletions configure.py
Original file line number Diff line number Diff line change
Expand Up @@ -412,6 +412,41 @@ def MatchingFor(*versions):
Object(NonMatching, "Runtime.PPCEABI.H/__init_cpp_exceptions.cpp"),
],
},
{

"lib": "FMOD",
"mw_version": config.linker_version,
"cflags": cflags_runtime,
"progress_category": "FMOD", # str | List[str]
"objects": [
Object(NonMatching, "FMOD/src/fmusic.c"),
Object(NonMatching, "FMOD/src/format_fsb.c"),
Object(NonMatching, "FMOD/src/format_gcadpcm.c"),
Object(NonMatching, "FMOD/src/fsound.c"),
Object(NonMatching, "FMOD/src/fsound_3d.c"),
Object(NonMatching, "FMOD/src/fsound_device.c"),
Object(NonMatching, "FMOD/src/fsound_async.c"),
Object(NonMatching, "FMOD/src/fsound_channel.c"),
Object(NonMatching, "FMOD/src/fsound_dsp.c"),
Object(NonMatching, "FMOD/src/fsound_gc.c"),
Object(NonMatching, "FMOD/src/fsound_sample.c"),
Object(NonMatching, "FMOD/src/fsound_stream.c"),
Object(NonMatching, "FMOD/src/mixer.c"),
Object(NonMatching, "FMOD/src/fsound_stream_decode.c"),
Object(NonMatching, "FMOD/src/mixer_clipcopy.c"),
Object(NonMatching, "FMOD/src/music_formatfsb.c"),
Object(NonMatching, "FMOD/src/output_gc.c"),
Object(NonMatching, "FMOD/src/output_nosound.c"),
Object(NonMatching, "FMOD/src/sound_software.c"),
Object(NonMatching, "FMOD/src/sound_software_3d.c"),
Object(NonMatching, "FMOD/src/system_file.c"),
Object(NonMatching, "FMOD/src/system_memory.c"),
Object(NonMatching, "FMOD/src/system_misc_gc.c"),
Object(NonMatching, "FMOD/src/system_thread.c"),
Object(NonMatching, "FMOD/src/system_time.c"),
Object(NonMatching, "FMOD/src/system_string.c"),
],
},
{
"lib": "binkngc",
"mw_version": "GC/1.3.2",
Expand Down Expand Up @@ -774,10 +809,9 @@ def MatchingFor(*versions):
RenderWareLib(
"rpcollis",
[
Object(NonMatching, "rwsdk/plugin/collis/ctgeom.c"),
Object(NonMatching, "rwsdk/plugin/collis/ctworld.c"),
Object(NonMatching, "rwsdk/plugin/collis/ctbsp.c"),
Object(NonMatching, "rwsdk/plugin/collis/rpcollis.c"),
Object(NonMatching, "rwsdk/plugin/rpcollis/ctdata.c"),
Object(NonMatching, "rwsdk/plugin/rpcollis/colldata.c"),
Object(NonMatching, "rwsdk/plugin/rpcollis/collquery.c"),
],
),
RenderWareLib(
Expand Down Expand Up @@ -908,6 +942,7 @@ def MatchingFor(*versions):
Object(NonMatching, "rwsdk/src/plcore/bavector.c"),
Object(NonMatching, "rwsdk/src/plcore/resmem.c"),
Object(NonMatching, "rwsdk/src/plcore/rwstring.c"),
Object(NonMatching, "rwsdk/src/plcore/rwgrp.c"),
Object(NonMatching, "rwsdk/os/gcn/osintf.c"),
Object(NonMatching, "rwsdk/src/babbox.c"),
Object(NonMatching, "rwsdk/src/babincam.c"),
Expand Down Expand Up @@ -975,6 +1010,7 @@ def link_order_callback(module_id: int, objects: List[str]) -> List[str]:
ProgressCategory("msl", "MSL"),
ProgressCategory("RW", "Renderware SDK"),
ProgressCategory("bink", "Bink SDK"),
ProgressCategory("FMOD", "FMOD SDK"),
]
config.progress_each_module = args.verbose

Expand Down