diff options
| author | Tharo <17233964+Thar0@users.noreply.github.com> | 2025-02-04 11:55:04 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-02-04 06:55:04 -0500 |
| commit | c028db03b47f8b38bc2a1b87569fd7fae0ea9067 (patch) | |
| tree | 99007ef3e69f69b4e6924ba54468adda49461565 /spec | |
| parent | 6c06168e7212616ea08460d487a4b99e89a34108 (diff) | |
Finish matching ique-cn (#2451)
* git subrepo clone git@github.com:Thar0/com-plugin.git tools/com-plugin
subrepo:
subdir: "tools/com-plugin"
merged: "e8543312d"
upstream:
origin: "git@github.com:Thar0/com-plugin.git"
branch: "main"
commit: "e8543312d"
git-subrepo:
version: "0.4.6"
origin: "https://github.com/ingydotnet/git-subrepo"
commit: "110b9eb"
* ique-cn OK
* Review suggestions
* Most suggestions
* git subrepo pull tools/com-plugin
subrepo:
subdir: "tools/com-plugin"
merged: "81595ed1c"
upstream:
origin: "git@github.com:Thar0/com-plugin.git"
branch: "main"
commit: "81595ed1c"
git-subrepo:
version: "0.4.6"
origin: "https://github.com/ingydotnet/git-subrepo"
commit: "110b9eb"
* Fix other versions
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/boot_libultra_gc.inc | 1 | ||||
| -rw-r--r-- | spec/boot_libultra_ique.inc | 1 | ||||
| -rw-r--r-- | spec/boot_libultra_n64.inc | 1 | ||||
| -rw-r--r-- | spec/spec | 25 |
4 files changed, 27 insertions, 1 deletions
diff --git a/spec/boot_libultra_gc.inc b/spec/boot_libultra_gc.inc index 5faf2fbbb..963e47215 100644 --- a/spec/boot_libultra_gc.inc +++ b/spec/boot_libultra_gc.inc @@ -17,6 +17,7 @@ include "$(BUILD_DIR)/src/libultra/os/writebackdcache.o" include "$(BUILD_DIR)/src/libultra/io/vigetnextframebuf.o" include "$(BUILD_DIR)/src/libultra/io/pimgr.o" + include "$(BUILD_DIR)/src/libultra/os/kdebugserver.o" include "$(BUILD_DIR)/src/libultra/io/devmgr.o" include "$(BUILD_DIR)/src/libultra/io/pirawdma.o" include "$(BUILD_DIR)/src/libultra/os/virtualtophysical.o" diff --git a/spec/boot_libultra_ique.inc b/spec/boot_libultra_ique.inc index c25edae2a..ac943b226 100644 --- a/spec/boot_libultra_ique.inc +++ b/spec/boot_libultra_ique.inc @@ -35,6 +35,7 @@ include "$(BUILD_DIR)/src/libultra/os/sethwintrroutine.o" include "$(BUILD_DIR)/src/libultra/os/gethwintrroutine.o" include "$(BUILD_DIR)/src/libultra/io/pimgr.o" + include "$(BUILD_DIR)/src/libultra/os/kdebugserver.o" include "$(BUILD_DIR)/src/libultra/io/epirawdma.o" include "$(BUILD_DIR)/src/libultra/io/epiread.o" include "$(BUILD_DIR)/src/libultra/io/epidma.o" diff --git a/spec/boot_libultra_n64.inc b/spec/boot_libultra_n64.inc index 678326f61..70c7d373a 100644 --- a/spec/boot_libultra_n64.inc +++ b/spec/boot_libultra_n64.inc @@ -19,6 +19,7 @@ include "$(BUILD_DIR)/src/libultra/os/writebackdcache.o" include "$(BUILD_DIR)/src/libultra/io/vigetnextframebuf.o" include "$(BUILD_DIR)/src/libultra/io/pimgr.o" + include "$(BUILD_DIR)/src/libultra/os/kdebugserver.o" include "$(BUILD_DIR)/src/libultra/io/devmgr.o" include "$(BUILD_DIR)/src/libultra/io/pirawdma.o" include "$(BUILD_DIR)/src/libultra/os/virtualtophysical.o" @@ -17,6 +17,12 @@ endseg beginseg name "boot" +#if PLATFORM_IQUE + include "*$(BUILD_DIR)/boot_bss_1.o" + include "*$(BUILD_DIR)/boot_bss_boot_main.o" + include "*$(BUILD_DIR)/boot_bss_idle.o" + include "*$(BUILD_DIR)/boot_bss_viconfig.o" +#endif include "$(BUILD_DIR)/src/boot/boot_main.o" include "$(BUILD_DIR)/src/boot/idle.o" #if OOT_VERSION >= PAL_1_0 @@ -24,6 +30,9 @@ beginseg #endif include "$(BUILD_DIR)/src/boot/carthandle.o" include "$(BUILD_DIR)/src/boot/z_std_dma.o" +#if PLATFORM_IQUE + include "*$(BUILD_DIR)/boot_bss_z_std_dma.o" +#endif #if !PLATFORM_IQUE include "$(BUILD_DIR)/src/boot/yaz0.o" #else @@ -101,6 +110,10 @@ beginseg include "$(BUILD_DIR)/src/libultra/libc/xprintf.o" #endif +#if PLATFORM_IQUE + include "*$(BUILD_DIR)/boot_bss_2.o" +#endif + // Functions that GCC-compiled code may depend on, placed in boot so they will always be loaded #ifdef COMPILER_GCC include "$(BUILD_DIR)/src/libultra/libc/string.o" @@ -505,6 +518,9 @@ beginseg after "dmadata" align 0x20 +#if PLATFORM_IQUE + include "*$(BUILD_DIR)/code_bss_1.o" +#endif include "$(BUILD_DIR)/src/code/z_en_a_keep.o" include "$(BUILD_DIR)/src/code/z_en_item00.o" include "$(BUILD_DIR)/src/code/z_eff_blure.o" @@ -518,6 +534,9 @@ beginseg include "$(BUILD_DIR)/src/code/flg_set.o" include "$(BUILD_DIR)/src/code/z_DLF.o" include "$(BUILD_DIR)/src/code/z_actor.o" +#if PLATFORM_IQUE + include "*$(BUILD_DIR)/code_bss_z_actor.o" +#endif include "$(BUILD_DIR)/src/code/z_actor_dlftbls.o" include "$(BUILD_DIR)/src/code/z_bgcheck.o" include "$(BUILD_DIR)/src/code/z_bg_collect.o" @@ -778,6 +797,11 @@ beginseg include "$(BUILD_DIR)/src/libc/sqrt.o" #endif +#if PLATFORM_IQUE + include "*$(BUILD_DIR)/code_bss_2.o" + include "*$(BUILD_DIR)/code_bss_3.o" +#endif + // For some reason, the data sections of z_message and z_game_over are // placed near the rodata sections of other files, so we first build this // combined object before the final link. @@ -816,7 +840,6 @@ beginseg include "$(BUILD_DIR)/src/libultra/mgu/mtxl2f.o" #endif #endif - endseg beginseg |