mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot synced 2026-07-07 05:55:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

[ntsc-1.2] Match __osMalloc.c and code_800FC620.c (new/delete) (#2106)

Browse Source 
* Match __osMalloc

* Match src/code/code_800FC620.c (new/delete)

* Wrap versions-specific files in ifdefs to fix compilation

* Fix bss

* Remove {FAULT,RAND,OSMALLOC}_VERSION in favor of PLATFORM_N64

* Fix __osMalloc data splits, add unused strings

* __osMalloc.h -> osMalloc.h

* Fix merge
This commit is contained in:
cadmic
2024-09-04 02:10:14 -07:00
committed by GitHub
parent af24970d89
commit c6d7cc7697
24 changed files with 682 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spec
+7 -3
View File
@@ -547,9 +547,9 @@ beginseg
#if OOT_DEBUG
include "$(BUILD_DIR)/src/code/debug_malloc.o"
#endif
#if FAULT_VERSION == FAULT_N64
#if PLATFORM_N64
include "$(BUILD_DIR)/src/code/fault_n64.o"
#elif FAULT_VERSION == FAULT_GC
#else
include "$(BUILD_DIR)/src/code/fault_gc.o"
include "$(BUILD_DIR)/src/code/fault_gc_drawer.o"
#endif
@@ -604,7 +604,11 @@ beginseg
include "$(BUILD_DIR)/src/code/fp.o"
include "$(BUILD_DIR)/src/code/system_malloc.o"
include "$(BUILD_DIR)/src/code/rand.o"
include "$(BUILD_DIR)/src/code/__osMalloc.o"
#if PLATFORM_N64
include "$(BUILD_DIR)/src/code/__osMalloc_n64.o"
#else
include "$(BUILD_DIR)/src/code/__osMalloc_gc.o"
#endif
#if !OOT_DEBUG
include "$(BUILD_DIR)/src/boot/sprintf.o"
#endif