Skip to content

Commit 0cb8ad6

Browse files
LivewireCBLivewireCB
authored
Merge pull request #34 from LivewireCB/main
Categorized FMOD and a few other files.
2 parents 96b43d6 + ee7229d commit 0cb8ad6

File tree

2 files changed

+70
-34
lines changed

2 files changed

+70
-34
lines changed

‎config/GGVE78/splits.txt‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1333,85 +1333,85 @@ MWTrace.c:
13331333
MWCriticalSection_gc.cpp:
13341334
.text start:0x802B9814 end:0x802B986C
13351335

1336-
fmusic.c:
1336+
FMOD/src/fmusic.c:
13371337
.text start:0x802B986C end:0x802BA764
13381338
.rodata start:0x8037F010 end:0x8037F020
13391339
.sdata2 start:0x804B4818 end:0x804B4830
13401340

1341-
format_fsb.c:
1341+
FMOD/src/format_fsb.c:
13421342
.text start:0x802BA764 end:0x802BBCDC
13431343
.rodata start:0x8037F020 end:0x8037F030
13441344
.sdata2 start:0x804B4830 end:0x804B4840
13451345

1346-
format_gcadpcm.c:
1346+
FMOD/src/format_gcadpcm.c:
13471347
.text start:0x802BBCDC end:0x802BC18C
13481348
.rodata start:0x8037F030 end:0x8037F048
13491349

1350-
fsound.c:
1350+
FMOD/src/fsound.c:
13511351
.text start:0x802BC18C end:0x802BCF50
13521352
.rodata start:0x8037F048 end:0x8037F070
13531353
.sdata start:0x804B05A8 end:0x804B05B0
13541354
.sbss start:0x804B1C70 end:0x804B1C80
13551355
.sdata2 start:0x804B4840 end:0x804B4850
13561356

1357-
fsound_3d.c:
1357+
FMOD/src/fsound_3d.c:
13581358
.text start:0x802BCF50 end:0x802BD3A4
13591359
.data start:0x803BAE58 end:0x803BAF78
13601360
.sdata start:0x804B05B0 end:0x804B05C0
13611361
.sbss start:0x804B1C80 end:0x804B1C88
13621362
.sdata2 start:0x804B4850 end:0x804B4858
13631363

1364-
fsound_device.c:
1364+
FMOD/src/fsound_device.c:
13651365
.data start:0x803BAF78 end:0x803BB258
13661366

1367-
fsound_async.c:
1367+
FMOD/src/fsound_async.c:
13681368
.text start:0x802BD3A4 end:0x802BD70C
13691369
.bss start:0x80464E38 end:0x80468E38
13701370

1371-
fsound_channel.c:
1371+
FMOD/src/fsound_channel.c:
13721372
.text start:0x802BD70C end:0x802C14B8
13731373
.rodata start:0x8037F070 end:0x8037F100
13741374
.sdata2 start:0x804B4858 end:0x804B4870
13751375

1376-
fsound_dsp.c:
1376+
FMOD/src/fsound_dsp.c:
13771377
.text start:0x802C14B8 end:0x802C184C
13781378
.rodata start:0x8037F100 end:0x8037F110
13791379

1380-
fsound_gc.c:
1380+
FMOD/src/fsound_gc.c:
13811381
.text start:0x802C184C end:0x802C1F88
13821382
.rodata start:0x8037F110 end:0x8037F120
13831383
.data start:0x803BB258 end:0x803BB658
13841384
.sbss start:0x804B1C88 end:0x804B1C90
13851385

1386-
fsound_sample.c:
1386+
FMOD/src/fsound_sample.c:
13871387
.text start:0x802C1F88 end:0x802C4670
13881388
.rodata start:0x8037F120 end:0x8037F140
13891389
.sdata2 start:0x804B4870 end:0x804B4880
13901390

1391-
fsound_stream.c:
1391+
FMOD/src/fsound_stream.c:
13921392
.text start:0x802C4670 end:0x802C89AC
13931393
.rodata start:0x8037F140 end:0x8037F1A0
13941394
.sdata start:0x804B05C0 end:0x804B05C8
13951395
.sbss start:0x804B1C90 end:0x804B1C98
13961396
.sdata2 start:0x804B4880 end:0x804B48B8
13971397
.sbss2 start:0x804B5190 end:0x804B5198
13981398

1399-
mixer.c:
1399+
FMOD/src/mixer.c:
14001400
.rodata start:0x8037F1A0 end:0x8037F308
14011401
.data start:0x803BB658 end:0x803BB930
14021402

1403-
fsound_stream_decode.c:
1403+
FMOD/src/fsound_stream_decode.c:
14041404
.text start:0x802C89AC end:0x802C8DB8
14051405

1406-
mixer_clipcopy.c:
1406+
FMOD/src/mixer_clipcopy.c:
14071407
.text start:0x802C8DB8 end:0x802C9178
14081408

1409-
music_formatfsb.c:
1409+
FMOD/src/music_formatfsb.c:
14101410
.text start:0x802C9178 end:0x802C9BCC
14111411
.rodata start:0x8037F308 end:0x8037F330
14121412
.sdata start:0x804B05C8 end:0x804B05D0
14131413

1414-
output_gc.c:
1414+
FMOD/src/output_gc.c:
14151415
.text start:0x802C9BCC end:0x802CCD74
14161416
.rodata start:0x8037F330 end:0x8037F428
14171417
.data start:0x803BB930 end:0x803BB990
@@ -1420,51 +1420,51 @@ output_gc.c:
14201420
.sbss start:0x804B1C98 end:0x804B1CF0
14211421
.sdata2 start:0x804B48B8 end:0x804B48D0
14221422

1423-
output_nosound.c:
1423+
FMOD/src/output_nosound.c:
14241424
.text start:0x802CCD74 end:0x802CD288
14251425
.rodata start:0x8037F428 end:0x8037F438
14261426
.data start:0x803BB990 end:0x803BBA48
14271427
.sdata2 start:0x804B48D0 end:0x804B48D8
14281428

1429-
sound_software.c:
1429+
FMOD/src/sound_software.c:
14301430
.text start:0x802CD288 end:0x802CFD64
14311431
.rodata start:0x8037F438 end:0x8037F450
14321432
.data start:0x803BBA48 end:0x803BBB48
14331433
.sbss start:0x804B1CF0 end:0x804B1CF8
14341434
.sdata2 start:0x804B48D8 end:0x804B4928
14351435

1436-
sound_software_3d.c:
1436+
FMOD/src/sound_software_3d.c:
14371437
.text start:0x802CFD64 end:0x802D059C
14381438
.sdata2 start:0x804B4928 end:0x804B4960
14391439

1440-
system_file.c:
1440+
FMOD/src/system_file.c:
14411441
.text start:0x802D059C end:0x802D13BC
14421442
.rodata start:0x8037F450 end:0x8037F460
14431443
.bss start:0x80468F58 end:0x80469658
14441444
.sdata start:0x804B05D8 end:0x804B05E0
14451445
.sbss start:0x804B1CF8 end:0x804B1D20
14461446
.sdata2 start:0x804B4960 end:0x804B4968
14471447

1448-
system_memory.c:
1448+
FMOD/src/system_memory.c:
14491449
.text start:0x802D13BC end:0x802D1EE0
14501450
.rodata start:0x8037F460 end:0x8037F470
14511451

1452-
system_misc_gc.c:
1452+
FMOD/src/system_misc_gc.c:
14531453
.text start:0x802D1EE0 end:0x802D2DB0
14541454
.rodata start:0x8037F470 end:0x8037F4A8
14551455
.data start:0x803BBB48 end:0x803BBBB0
14561456
.sdata start:0x804B05E0 end:0x804B05E8
14571457
.sbss start:0x804B1D20 end:0x804B1D28
14581458

1459-
system_thread.c:
1459+
FMOD/src/system_thread.c:
14601460
.text start:0x802D2DB0 end:0x802D3264
14611461
.rodata start:0x8037F4A8 end:0x8037F4B8
14621462

1463-
system_time.c:
1463+
FMOD/src/system_time.c:
14641464
.text start:0x802D3264 end:0x802D3520
14651465
.sdata2 start:0x804B4968 end:0x804B4988
14661466

1467-
system_string.c:
1467+
FMOD/src/system_string.c:
14681468
.text start:0x802D3520 end:0x802D3754
14691469

14701470
dolphin/src/ai/ai.c:
@@ -1916,14 +1916,14 @@ OdemuExi2/DebuggerDriver.c:
19161916
.sdata start:0x804B0750 end:0x804B0758
19171917
.sbss start:0x804B2180 end:0x804B2198
19181918

1919-
ctdata.c:
1919+
rwsdk/plugin/rpcollis/ctdata.c:
19201920
.text start:0x8030088C end:0x803011A4
19211921

1922-
colldata.c:
1922+
rwsdk/plugin/rpcollis/colldata.c:
19231923
.text start:0x803011A4 end:0x80301604
19241924
.sbss start:0x804B2198 end:0x804B21B0
19251925

1926-
collquery.c:
1926+
rwsdk/plugin/rpcollis/collquery.c:
19271927
.text start:0x80301604 end:0x803036D0
19281928
.sdata2 start:0x804B4B18 end:0x804B4B30
19291929

@@ -2300,7 +2300,7 @@ rwsdk/src/plcore/bavector.c:
23002300
rwsdk/src/plcore/resmem.c:
23012301
.text start:0x80340DE0 end:0x80341020
23022302

2303-
rwgrp.c:
2303+
rwsdk/src/plcore/rwgrp.c:
23042304
.text start:0x80341020 end:0x80341100
23052305
.bss start:0x80486C50 end:0x80486C78
23062306
.sdata start:0x804B0818 end:0x804B0820

‎configure.py‎

Lines changed: 40 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -412,6 +412,41 @@ def MatchingFor(*versions):
412412
Object(NonMatching, "Runtime.PPCEABI.H/__init_cpp_exceptions.cpp"),
413413
],
414414
},
415+
{
416+
417+
"lib": "FMOD",
418+
"mw_version": config.linker_version,
419+
"cflags": cflags_runtime,
420+
"progress_category": "FMOD", # str | List[str]
421+
"objects": [
422+
Object(NonMatching, "FMOD/src/fmusic.c"),
423+
Object(NonMatching, "FMOD/src/format_fsb.c"),
424+
Object(NonMatching, "FMOD/src/format_gcadpcm.c"),
425+
Object(NonMatching, "FMOD/src/fsound.c"),
426+
Object(NonMatching, "FMOD/src/fsound_3d.c"),
427+
Object(NonMatching, "FMOD/src/fsound_device.c"),
428+
Object(NonMatching, "FMOD/src/fsound_async.c"),
429+
Object(NonMatching, "FMOD/src/fsound_channel.c"),
430+
Object(NonMatching, "FMOD/src/fsound_dsp.c"),
431+
Object(NonMatching, "FMOD/src/fsound_gc.c"),
432+
Object(NonMatching, "FMOD/src/fsound_sample.c"),
433+
Object(NonMatching, "FMOD/src/fsound_stream.c"),
434+
Object(NonMatching, "FMOD/src/mixer.c"),
435+
Object(NonMatching, "FMOD/src/fsound_stream_decode.c"),
436+
Object(NonMatching, "FMOD/src/mixer_clipcopy.c"),
437+
Object(NonMatching, "FMOD/src/music_formatfsb.c"),
438+
Object(NonMatching, "FMOD/src/output_gc.c"),
439+
Object(NonMatching, "FMOD/src/output_nosound.c"),
440+
Object(NonMatching, "FMOD/src/sound_software.c"),
441+
Object(NonMatching, "FMOD/src/sound_software_3d.c"),
442+
Object(NonMatching, "FMOD/src/system_file.c"),
443+
Object(NonMatching, "FMOD/src/system_memory.c"),
444+
Object(NonMatching, "FMOD/src/system_misc_gc.c"),
445+
Object(NonMatching, "FMOD/src/system_thread.c"),
446+
Object(NonMatching, "FMOD/src/system_time.c"),
447+
Object(NonMatching, "FMOD/src/system_string.c"),
448+
],
449+
},
415450
{
416451
"lib": "binkngc",
417452
"mw_version": "GC/1.3.2",
@@ -774,10 +809,9 @@ def MatchingFor(*versions):
774809
RenderWareLib(
775810
"rpcollis",
776811
[
777-
Object(NonMatching, "rwsdk/plugin/collis/ctgeom.c"),
778-
Object(NonMatching, "rwsdk/plugin/collis/ctworld.c"),
779-
Object(NonMatching, "rwsdk/plugin/collis/ctbsp.c"),
780-
Object(NonMatching, "rwsdk/plugin/collis/rpcollis.c"),
812+
Object(NonMatching, "rwsdk/plugin/rpcollis/ctdata.c"),
813+
Object(NonMatching, "rwsdk/plugin/rpcollis/colldata.c"),
814+
Object(NonMatching, "rwsdk/plugin/rpcollis/collquery.c"),
781815
],
782816
),
783817
RenderWareLib(
@@ -908,6 +942,7 @@ def MatchingFor(*versions):
908942
Object(NonMatching, "rwsdk/src/plcore/bavector.c"),
909943
Object(NonMatching, "rwsdk/src/plcore/resmem.c"),
910944
Object(NonMatching, "rwsdk/src/plcore/rwstring.c"),
945+
Object(NonMatching, "rwsdk/src/plcore/rwgrp.c"),
911946
Object(NonMatching, "rwsdk/os/gcn/osintf.c"),
912947
Object(NonMatching, "rwsdk/src/babbox.c"),
913948
Object(NonMatching, "rwsdk/src/babincam.c"),
@@ -975,6 +1010,7 @@ def link_order_callback(module_id: int, objects: List[str]) -> List[str]:
9751010
ProgressCategory("msl", "MSL"),
9761011
ProgressCategory("RW", "Renderware SDK"),
9771012
ProgressCategory("bink", "Bink SDK"),
1013+
ProgressCategory("FMOD", "FMOD SDK"),
9781014
]
9791015
config.progress_each_module = args.verbose
9801016

0 commit comments

Comments
 (0)