diff options
| author | Sean Miller <seanmiller999@gmail.com> | 2026-04-06 16:54:52 +0100 |
|---|---|---|
| committer | Sean Miller <seanmiller999@gmail.com> | 2026-04-06 16:54:52 +0100 |
| commit | 5bd9fb7badf06a3da32d8b15ea57a3f5f00b8a7a (patch) | |
| tree | fbb57622fc05f385e00ae853e601ac57c8986c66 | |
| parent | 97d808fe06b024aa79e17d23c744003085dad5f6 (diff) | |
Fix definition of global variables in header file
| -rw-r--r-- | include/d/d_sys.h | 8 | ||||
| -rw-r--r-- | src/d/d_sys.cpp | 10 |
2 files changed, 14 insertions, 4 deletions
diff --git a/include/d/d_sys.h b/include/d/d_sys.h index f8fbc979..45550b4c 100644 --- a/include/d/d_sys.h +++ b/include/d/d_sys.h @@ -48,10 +48,10 @@ public: namespace dSystem { -void *s_OrgMEM1ArenaLo; -void *s_NewMEM1ArenaLo; -void *s_OrgMEM1ArenaHi; -void *s_NewMEM1ArenaHi; +extern void *s_OrgMEM1ArenaLo; +extern void *s_NewMEM1ArenaLo; +extern void *s_OrgMEM1ArenaHi; +extern void *s_NewMEM1ArenaHi; void fixHeaps(); diff --git a/src/d/d_sys.cpp b/src/d/d_sys.cpp index c0315dd9..a988ce03 100644 --- a/src/d/d_sys.cpp +++ b/src/d/d_sys.cpp @@ -43,12 +43,22 @@ #include "rvl/GX.h" #include "rvl/OS.h" +namespace dSystem { + +void *s_OrgMEM1ArenaLo; +void *s_NewMEM1ArenaLo; +void *s_OrgMEM1ArenaHi; +void *s_NewMEM1ArenaHi; + +} + System SysConfig; System *dSys_c::ms_configuration_p; EGG::Heap *dSys_c::ms_RootHeapMem1; EGG::Heap *dSys_c::ms_RootHeapMem2; +// TODO Replace with proper import + names extern u32 lbl_80574FA0; extern u32 lbl_80574FA4; |