mirror of
https://github.com/zeldaret/oot
synced 2026-05-23 06:54:24 -04:00
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
This commit is contained in:
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user