From 32c90472a9ac381753f3af4dc9b1f94f90cc3553 Mon Sep 17 00:00:00 2001 From: Jcw87 Date: Thu, 21 Sep 2023 11:59:02 -0700 Subject: [PATCH] missing configure.py changes from b2fc1d2683958a772da702d74bbbfd8e4a1d514c missing splits.txt changes from adb95b135c3d7498eba29bbd9728d345eed5a407 --- config/GZLJ01/splits.txt | 48 ++++++++++++++++++++-------------------- config/GZLP01/splits.txt | 48 ++++++++++++++++++++-------------------- configure.py | 26 +++++++++++----------- 3 files changed, 61 insertions(+), 61 deletions(-) diff --git a/config/GZLJ01/splits.txt b/config/GZLJ01/splits.txt index 8a10d4cd7..7f8582fd7 100644 --- a/config/GZLJ01/splits.txt +++ b/config/GZLJ01/splits.txt @@ -3955,98 +3955,98 @@ MSL_C/Math/Double_precision/w_fmod.c: MSL_C/PPC_EABI/math_ppc.c: .text start:0x8032E858 end:0x8032E8E8 -TRK_MINNOW_DOLPHIN/mainloop.c: +TRK_MINNOW_DOLPHIN/Portable/mainloop.c: .text start:0x8032E8E8 end:0x8032E9E0 -TRK_MINNOW_DOLPHIN/nubevent.c: +TRK_MINNOW_DOLPHIN/Portable/nubevent.c: .text start:0x8032E9E0 end:0x8032EC08 .bss start:0x803E53E0 end:0x803E5408 -TRK_MINNOW_DOLPHIN/nubinit.c: +TRK_MINNOW_DOLPHIN/Portable/nubinit.c: .text start:0x8032EC08 end:0x8032ED88 .rodata start:0x80364900 end:0x80364920 .bss start:0x803E5408 end:0x803E5410 -TRK_MINNOW_DOLPHIN/msg.c: +TRK_MINNOW_DOLPHIN/Portable/msg.c: .text start:0x8032ED88 end:0x8032EF64 -TRK_MINNOW_DOLPHIN/msgbuf.c: +TRK_MINNOW_DOLPHIN/Portable/msgbuf.c: .text start:0x8032EF64 end:0x8032F990 .rodata start:0x80364920 end:0x80364940 .bss start:0x803E5410 end:0x803E6DC0 -TRK_MINNOW_DOLPHIN/serpoll.c: +TRK_MINNOW_DOLPHIN/Portable/serpoll.c: .text start:0x8032F990 end:0x8032FD5C .bss start:0x803E6DC0 end:0x803E6DD8 -TRK_MINNOW_DOLPHIN/usr_put.c: +TRK_MINNOW_DOLPHIN/Portable/usr_put.c: .text start:0x8032FD5C end:0x8032FDE8 -TRK_MINNOW_DOLPHIN/dispatch.c: +TRK_MINNOW_DOLPHIN/Portable/dispatch.c: .text start:0x8032FDE8 end:0x8032FE84 .data start:0x80395D20 end:0x80395DA8 .bss start:0x803E6DD8 end:0x803E6DE0 -TRK_MINNOW_DOLPHIN/msghndlr.c: +TRK_MINNOW_DOLPHIN/Portable/msghndlr.c: .text start:0x8032FE84 end:0x803326E4 .data start:0x80395DA8 end:0x80395DE0 .bss start:0x803E6DE0 end:0x803E6DE8 -TRK_MINNOW_DOLPHIN/support.c: +TRK_MINNOW_DOLPHIN/Portable/support.c: .text start:0x803326E4 end:0x80332FA4 -TRK_MINNOW_DOLPHIN/mutex_TRK.c: +TRK_MINNOW_DOLPHIN/Portable/mutex_TRK.c: .text start:0x80332FA4 end:0x80332FBC -TRK_MINNOW_DOLPHIN/notify.c: +TRK_MINNOW_DOLPHIN/Portable/notify.c: .text start:0x80332FBC end:0x80333094 -TRK_MINNOW_DOLPHIN/flush_cache.c: +TRK_MINNOW_DOLPHIN/ppc/Generic/flush_cache.c: .text start:0x80333094 end:0x803330CC -TRK_MINNOW_DOLPHIN/mem_TRK.c: +TRK_MINNOW_DOLPHIN/Portable/mem_TRK.c: .init start:0x800034E0 end:0x80003534 .text start:0x803330CC end:0x80333188 -TRK_MINNOW_DOLPHIN/targimpl.c: +TRK_MINNOW_DOLPHIN/ppc/Generic/targimpl.c: .text start:0x80333188 end:0x80334A18 .rodata start:0x80364940 end:0x803649C8 .data start:0x80395DE0 end:0x80395E10 .bss start:0x803E6DE8 end:0x803E7368 -TRK_MINNOW_DOLPHIN/targsupp.s: comment:0 +TRK_MINNOW_DOLPHIN/ppc/Export/targsupp.s: comment:0 .text start:0x80334A20 end:0x80334A40 align:16 -TRK_MINNOW_DOLPHIN/__exception.c: comment:0 +TRK_MINNOW_DOLPHIN/ppc/Generic/__exception.c: comment:0 .init start:0x80003534 end:0x80005468 -TRK_MINNOW_DOLPHIN/dolphin_trk.c: +TRK_MINNOW_DOLPHIN/Os/dolphin/dolphin_trk.c: .init start:0x80005468 end:0x8000556C .text start:0x80334A40 end:0x80334B80 .data start:0x80395E10 end:0x80395E50 .bss start:0x803E7368 end:0x803E7370 -TRK_MINNOW_DOLPHIN/mpc_7xx_603e.c: +TRK_MINNOW_DOLPHIN/ppc/Generic/mpc_7xx_603e.c: .text start:0x80334B80 end:0x80334EF8 -TRK_MINNOW_DOLPHIN/main_TRK.c: +TRK_MINNOW_DOLPHIN/Portable/main_TRK.c: .text start:0x80334EF8 end:0x80334F3C .bss start:0x803E7370 end:0x803E7378 -TRK_MINNOW_DOLPHIN/dolphin_trk_glue.c: +TRK_MINNOW_DOLPHIN/Os/dolphin/dolphin_trk_glue.c: .text start:0x80334F3C end:0x803353E8 .rodata start:0x803649C8 end:0x80364A10 .data start:0x80395E50 end:0x80395E6C .bss start:0x803E7378 end:0x803E95A0 -TRK_MINNOW_DOLPHIN/targcont.c: +TRK_MINNOW_DOLPHIN/Os/dolphin/targcont.c: .text start:0x803353E8 end:0x8033541C -TRK_MINNOW_DOLPHIN/target_options.c: +TRK_MINNOW_DOLPHIN/Os/dolphin/target_options.c: .text start:0x8033541C end:0x80335438 .bss start:0x803E95A0 end:0x803E95A1 -TRK_MINNOW_DOLPHIN/mslsupp.c: +TRK_MINNOW_DOLPHIN/MetroTRK/Export/mslsupp.c: .text start:0x80335438 end:0x803355B0 amcstubs/AmcExi2Stubs.c: diff --git a/config/GZLP01/splits.txt b/config/GZLP01/splits.txt index 9a79cbdb2..216265d4a 100644 --- a/config/GZLP01/splits.txt +++ b/config/GZLP01/splits.txt @@ -3959,98 +3959,98 @@ MSL_C/Math/Double_precision/w_fmod.c: MSL_C/PPC_EABI/math_ppc.c: .text start:0x803363AC end:0x8033643C -TRK_MINNOW_DOLPHIN/mainloop.c: +TRK_MINNOW_DOLPHIN/Portable/mainloop.c: .text start:0x8033643C end:0x80336534 -TRK_MINNOW_DOLPHIN/nubevent.c: +TRK_MINNOW_DOLPHIN/Portable/nubevent.c: .text start:0x80336534 end:0x8033675C .bss start:0x803F9700 end:0x803F9728 -TRK_MINNOW_DOLPHIN/nubinit.c: +TRK_MINNOW_DOLPHIN/Portable/nubinit.c: .text start:0x8033675C end:0x803368DC .rodata start:0x80378140 end:0x80378160 .bss start:0x803F9728 end:0x803F9730 -TRK_MINNOW_DOLPHIN/msg.c: +TRK_MINNOW_DOLPHIN/Portable/msg.c: .text start:0x803368DC end:0x80336AB8 -TRK_MINNOW_DOLPHIN/msgbuf.c: +TRK_MINNOW_DOLPHIN/Portable/msgbuf.c: .text start:0x80336AB8 end:0x803374E4 .rodata start:0x80378160 end:0x80378180 .bss start:0x803F9730 end:0x803FB0E0 -TRK_MINNOW_DOLPHIN/serpoll.c: +TRK_MINNOW_DOLPHIN/Portable/serpoll.c: .text start:0x803374E4 end:0x803378B0 .bss start:0x803FB0E0 end:0x803FB0F8 -TRK_MINNOW_DOLPHIN/usr_put.c: +TRK_MINNOW_DOLPHIN/Portable/usr_put.c: .text start:0x803378B0 end:0x8033793C -TRK_MINNOW_DOLPHIN/dispatch.c: +TRK_MINNOW_DOLPHIN/Portable/dispatch.c: .text start:0x8033793C end:0x803379D8 .data start:0x803A9500 end:0x803A9588 .bss start:0x803FB0F8 end:0x803FB100 -TRK_MINNOW_DOLPHIN/msghndlr.c: +TRK_MINNOW_DOLPHIN/Portable/msghndlr.c: .text start:0x803379D8 end:0x8033A238 .data start:0x803A9588 end:0x803A95C0 .bss start:0x803FB100 end:0x803FB108 -TRK_MINNOW_DOLPHIN/support.c: +TRK_MINNOW_DOLPHIN/Portable/support.c: .text start:0x8033A238 end:0x8033AAF8 -TRK_MINNOW_DOLPHIN/mutex_TRK.c: +TRK_MINNOW_DOLPHIN/Portable/mutex_TRK.c: .text start:0x8033AAF8 end:0x8033AB10 -TRK_MINNOW_DOLPHIN/notify.c: +TRK_MINNOW_DOLPHIN/Portable/notify.c: .text start:0x8033AB10 end:0x8033ABE8 -TRK_MINNOW_DOLPHIN/flush_cache.c: +TRK_MINNOW_DOLPHIN/ppc/Generic/flush_cache.c: .text start:0x8033ABE8 end:0x8033AC20 -TRK_MINNOW_DOLPHIN/mem_TRK.c: +TRK_MINNOW_DOLPHIN/Portable/mem_TRK.c: .init start:0x800034E0 end:0x80003534 .text start:0x8033AC20 end:0x8033ACDC -TRK_MINNOW_DOLPHIN/targimpl.c: +TRK_MINNOW_DOLPHIN/ppc/Generic/targimpl.c: .text start:0x8033ACDC end:0x8033C56C .rodata start:0x80378180 end:0x80378208 .data start:0x803A95C0 end:0x803A95F0 .bss start:0x803FB108 end:0x803FB688 -TRK_MINNOW_DOLPHIN/targsupp.s: comment:0 +TRK_MINNOW_DOLPHIN/ppc/Export/targsupp.s: comment:0 .text start:0x8033C570 end:0x8033C590 align:16 -TRK_MINNOW_DOLPHIN/__exception.c: comment:0 +TRK_MINNOW_DOLPHIN/ppc/Generic/__exception.c: comment:0 .init start:0x80003534 end:0x80005468 -TRK_MINNOW_DOLPHIN/dolphin_trk.c: +TRK_MINNOW_DOLPHIN/Os/dolphin/dolphin_trk.c: .init start:0x80005468 end:0x8000556C .text start:0x8033C590 end:0x8033C6D0 .data start:0x803A95F0 end:0x803A9630 .bss start:0x803FB688 end:0x803FB690 -TRK_MINNOW_DOLPHIN/mpc_7xx_603e.c: +TRK_MINNOW_DOLPHIN/ppc/Generic/mpc_7xx_603e.c: .text start:0x8033C6D0 end:0x8033CA48 -TRK_MINNOW_DOLPHIN/main_TRK.c: +TRK_MINNOW_DOLPHIN/Portable/main_TRK.c: .text start:0x8033CA48 end:0x8033CA8C .bss start:0x803FB690 end:0x803FB698 -TRK_MINNOW_DOLPHIN/dolphin_trk_glue.c: +TRK_MINNOW_DOLPHIN/Os/dolphin/dolphin_trk_glue.c: .text start:0x8033CA8C end:0x8033CF38 .rodata start:0x80378208 end:0x80378250 .data start:0x803A9630 end:0x803A964C .bss start:0x803FB698 end:0x803FD8C0 -TRK_MINNOW_DOLPHIN/targcont.c: +TRK_MINNOW_DOLPHIN/Os/dolphin/targcont.c: .text start:0x8033CF38 end:0x8033CF6C -TRK_MINNOW_DOLPHIN/target_options.c: +TRK_MINNOW_DOLPHIN/Os/dolphin/target_options.c: .text start:0x8033CF6C end:0x8033CF88 .bss start:0x803FD8C0 end:0x803FD8C1 -TRK_MINNOW_DOLPHIN/mslsupp.c: +TRK_MINNOW_DOLPHIN/MetroTRK/Export/mslsupp.c: .text start:0x8033CF88 end:0x8033D100 amcstubs/AmcExi2Stubs.c: diff --git a/configure.py b/configure.py index 68caadf78..30dd98e80 100644 --- a/configure.py +++ b/configure.py @@ -337,17 +337,17 @@ config.libs = [ Object(NonMatching, "d/d_chain.cpp"), Object(NonMatching, "d/d_cloth_packet.cpp"), Object(NonMatching, "d/actor/d_a_obj.cpp"), - Object(NonMatching, "d/actor/d_a_obj_tribox_static.cpp"), - Object(NonMatching, "d/actor/d_a_ship_static.cpp"), - Object(NonMatching, "d/actor/d_a_boko_static.cpp"), - Object(NonMatching, "d/actor/d_a_bomb_static.cpp"), - Object(NonMatching, "d/actor/d_a_branch_static.cpp"), - Object(NonMatching, "d/actor/d_a_mgameboard_static.cpp"), - Object(NonMatching, "d/actor/d_a_itembase_static.cpp"), - Object(NonMatching, "d/actor/d_a_item_static.cpp"), - Object(NonMatching, "d/actor/d_a_shop_item_static.cpp"), - Object(NonMatching, "d/actor/d_a_race_item_static.cpp"), - Object(NonMatching, "d/actor/d_a_leaflift_static.cpp"), + Object(NonMatching, "d/d_a_obj_tribox_static.cpp"), + Object(NonMatching, "d/d_a_ship_static.cpp"), + Object(NonMatching, "d/d_a_boko_static.cpp"), + Object(NonMatching, "d/d_a_bomb_static.cpp"), + Object(NonMatching, "d/d_a_branch_static.cpp"), + Object(NonMatching, "d/d_a_mgameboard_static.cpp"), + Object(NonMatching, "d/d_a_itembase_static.cpp"), + Object(NonMatching, "d/d_a_item_static.cpp"), + Object(NonMatching, "d/d_a_shop_item_static.cpp"), + Object(NonMatching, "d/d_a_race_item_static.cpp"), + Object(NonMatching, "d/d_a_leaflift_static.cpp"), Object(NonMatching, "d/d_demo.cpp"), Object(NonMatching, "d/d_door.cpp"), Object(NonMatching, "d/d_resorce.cpp"), @@ -400,8 +400,8 @@ config.libs = [ Object(NonMatching, "d/d_s_actor_data_mng.cpp"), Object(NonMatching, "d/d_item.cpp"), Object(NonMatching, "d/d_2dnumber.cpp"), - Object(NonMatching, "d/actor/d_a_npc_cb1_static.cpp"), - Object(NonMatching, "d/actor/d_a_npc_mk_static.cpp"), + Object(NonMatching, "d/d_a_npc_cb1_static.cpp"), + Object(NonMatching, "d/d_a_npc_mk_static.cpp"), Object(NonMatching, "d/d_salvage.cpp"), Object(NonMatching, "d/d_snap.cpp"), Object(NonMatching, "d/d_point_wind.cpp"),