From 96ffd91c9a2cd145c0a40fb05de47af695fa6ffb Mon Sep 17 00:00:00 2001
From: Pieter-Jan Briers <pieterjan.briers@gmail.com>
Date: Mon, 23 Feb 2026 20:17:37 +0100
Subject: [PATCH] Fix JASGlobalInstance instance definitions (#3108)

There are a few places where JASGlobalInstance have their sInstance storage implemented via template specialization. The problem is that these have no initializer, which means that they are not proper definitions (only declarations) in standards-compliant C++. MSVC and (evidently) MWCC accept this, but modern Clang and GCC do not and won't emit symbols.

I've added a macro that properly initializes these outside MWCC.

Also, JASGlobalInstance<JAUSectionHeap> was only being declared in each actor file that used it, which sounds incorrect? Not sure about this but I added it to m_Do_main too, again behind MWERKS check.
---
 include/JSystem/JAudio2/JASGadget.h |  6 ++++
 src/Z2AudioCS/SpkSystem.cpp         |  4 +--
 src/m_Do/m_Do_main.cpp              | 51 ++++++++++++++++-------------
 3 files changed, 36 insertions(+), 25 deletions(-)

diff --git a/include/JSystem/JAudio2/JASGadget.h b/include/JSystem/JAudio2/JASGadget.h
index 718ce02069..53eaefb6a4 100644
--- a/include/JSystem/JAudio2/JASGadget.h
+++ b/include/JSystem/JAudio2/JASGadget.h
@@ -4,6 +4,12 @@
 #include "JSystem/JUtility/JUTAssert.h"
 #include <string>
 
+#ifdef __MWERKS__
+#define JAS_GLOBAL_INSTANCE_INIT
+#else
+#define JAS_GLOBAL_INSTANCE_INIT {}
+#endif
+
 /**
  * @ingroup jsystem-jaudio
  * 
diff --git a/src/Z2AudioCS/SpkSystem.cpp b/src/Z2AudioCS/SpkSystem.cpp
index 9e245f7503..ebb4c71ff6 100644
--- a/src/Z2AudioCS/SpkSystem.cpp
+++ b/src/Z2AudioCS/SpkSystem.cpp
@@ -7,8 +7,8 @@
 #include "JSystem/JAudio2/JASHeapCtrl.h"
 #include "JSystem/JKernel/JKRHeap.h"
 
-template<> SpkSystem* JASGlobalInstance<SpkSystem>::sInstance;
-template<> SpkSoundHolder* JASGlobalInstance<SpkSoundHolder>::sInstance;
+template<> SpkSystem* JASGlobalInstance<SpkSystem>::sInstance JAS_GLOBAL_INSTANCE_INIT;
+template<> SpkSoundHolder* JASGlobalInstance<SpkSoundHolder>::sInstance JAS_GLOBAL_INSTANCE_INIT;
 
 const static s32 cConfigVolumeMax = 15;
 
diff --git a/src/m_Do/m_Do_main.cpp b/src/m_Do/m_Do_main.cpp
index 632c374ef1..901b8c980b 100644
--- a/src/m_Do/m_Do_main.cpp
+++ b/src/m_Do/m_Do_main.cpp
@@ -939,70 +939,75 @@ bool JKRHeap::dump_sort() {
 }
 
 template<>
-Z2WolfHowlMgr* JASGlobalInstance<Z2WolfHowlMgr>::sInstance;
+Z2WolfHowlMgr* JASGlobalInstance<Z2WolfHowlMgr>::sInstance JAS_GLOBAL_INSTANCE_INIT;
 
 template<>
-Z2EnvSeMgr* JASGlobalInstance<Z2EnvSeMgr>::sInstance;
+Z2EnvSeMgr* JASGlobalInstance<Z2EnvSeMgr>::sInstance JAS_GLOBAL_INSTANCE_INIT;
 
 template<>
-Z2FxLineMgr* JASGlobalInstance<Z2FxLineMgr>::sInstance;
+Z2FxLineMgr* JASGlobalInstance<Z2FxLineMgr>::sInstance JAS_GLOBAL_INSTANCE_INIT;
 
 template<>
-Z2Audience* JASGlobalInstance<Z2Audience>::sInstance;
+Z2Audience* JASGlobalInstance<Z2Audience>::sInstance JAS_GLOBAL_INSTANCE_INIT;
 
 template<>
-Z2SoundObjMgr* JASGlobalInstance<Z2SoundObjMgr>::sInstance;
+Z2SoundObjMgr* JASGlobalInstance<Z2SoundObjMgr>::sInstance JAS_GLOBAL_INSTANCE_INIT;
 
 template<>
-Z2SoundInfo* JASGlobalInstance<Z2SoundInfo>::sInstance;
+Z2SoundInfo* JASGlobalInstance<Z2SoundInfo>::sInstance JAS_GLOBAL_INSTANCE_INIT;
 
 template<>
-JAUSoundInfo* JASGlobalInstance<JAUSoundInfo>::sInstance;
+JAUSoundInfo* JASGlobalInstance<JAUSoundInfo>::sInstance JAS_GLOBAL_INSTANCE_INIT;
 
 template<>
-JAUSoundNameTable* JASGlobalInstance<JAUSoundNameTable>::sInstance;
+JAUSoundNameTable* JASGlobalInstance<JAUSoundNameTable>::sInstance JAS_GLOBAL_INSTANCE_INIT;
 
 template<>
-JAUSoundTable* JASGlobalInstance<JAUSoundTable>::sInstance;
+JAUSoundTable* JASGlobalInstance<JAUSoundTable>::sInstance JAS_GLOBAL_INSTANCE_INIT;
 
 template<>
-JAISoundInfo* JASGlobalInstance<JAISoundInfo>::sInstance;
+JAISoundInfo* JASGlobalInstance<JAISoundInfo>::sInstance JAS_GLOBAL_INSTANCE_INIT;
 
 template<>
-Z2SoundMgr* JASGlobalInstance<Z2SoundMgr>::sInstance;
+Z2SoundMgr* JASGlobalInstance<Z2SoundMgr>::sInstance JAS_GLOBAL_INSTANCE_INIT;
 
 template<>
-JAIStreamMgr* JASGlobalInstance<JAIStreamMgr>::sInstance;
+JAIStreamMgr* JASGlobalInstance<JAIStreamMgr>::sInstance JAS_GLOBAL_INSTANCE_INIT;
 
 template<>
-JAISeqMgr* JASGlobalInstance<JAISeqMgr>::sInstance;
+JAISeqMgr* JASGlobalInstance<JAISeqMgr>::sInstance JAS_GLOBAL_INSTANCE_INIT;
 
 template<>
-JAISeMgr* JASGlobalInstance<JAISeMgr>::sInstance;
+JAISeMgr* JASGlobalInstance<JAISeMgr>::sInstance JAS_GLOBAL_INSTANCE_INIT;
 
 template<>
-Z2SpeechMgr2* JASGlobalInstance<Z2SpeechMgr2>::sInstance;
+Z2SpeechMgr2* JASGlobalInstance<Z2SpeechMgr2>::sInstance JAS_GLOBAL_INSTANCE_INIT;
 
 template<>
-Z2SoundStarter* JASGlobalInstance<Z2SoundStarter>::sInstance;
+Z2SoundStarter* JASGlobalInstance<Z2SoundStarter>::sInstance JAS_GLOBAL_INSTANCE_INIT;
 
 template<>
-JAISoundStarter* JASGlobalInstance<JAISoundStarter>::sInstance;
+JAISoundStarter* JASGlobalInstance<JAISoundStarter>::sInstance JAS_GLOBAL_INSTANCE_INIT;
 
 template<>
-Z2StatusMgr* JASGlobalInstance<Z2StatusMgr>::sInstance;
+Z2StatusMgr* JASGlobalInstance<Z2StatusMgr>::sInstance JAS_GLOBAL_INSTANCE_INIT;
 
 template<>
-Z2SceneMgr* JASGlobalInstance<Z2SceneMgr>::sInstance;
+Z2SceneMgr* JASGlobalInstance<Z2SceneMgr>::sInstance JAS_GLOBAL_INSTANCE_INIT;
 
 template<>
-Z2SeqMgr* JASGlobalInstance<Z2SeqMgr>::sInstance;
+Z2SeqMgr* JASGlobalInstance<Z2SeqMgr>::sInstance JAS_GLOBAL_INSTANCE_INIT;
 
 template<>
-Z2SeMgr* JASGlobalInstance<Z2SeMgr>::sInstance;
+Z2SeMgr* JASGlobalInstance<Z2SeMgr>::sInstance JAS_GLOBAL_INSTANCE_INIT;
 
 template<>
-JASAudioThread* JASGlobalInstance<JASAudioThread>::sInstance;
+JASAudioThread* JASGlobalInstance<JASAudioThread>::sInstance JAS_GLOBAL_INSTANCE_INIT;
 
 template<>
-JASDefaultBankTable* JASGlobalInstance<JASDefaultBankTable>::sInstance;
+JASDefaultBankTable* JASGlobalInstance<JASDefaultBankTable>::sInstance JAS_GLOBAL_INSTANCE_INIT;
+
+#ifndef __MWERKS__
+template<>
+JAUSectionHeap* JASGlobalInstance<JAUSectionHeap>::sInstance JAS_GLOBAL_INSTANCE_INIT;
+#endif