Fix debug build

CMakeLists.txt

@@ -339,15 +339,6 @@ include(${CMAKE_CURRENT_LIST_DIR}/bintoc/bintocHelpers.cmake)
 
 add_subdirectory(extern)
 add_subdirectory(imgui)
-
-if(NOT TARGET atdna)
-  # Import native atdna if cross-compiling
-  find_package(atdna REQUIRED)
-  if(NOT TARGET atdna)
-    message(FATAL_ERROR "atdna required for building Metaforce; please verify LLVM installation")
-  endif()
-endif()
-
 add_subdirectory(NESEmulator EXCLUDE_FROM_ALL)
 add_subdirectory(Runtime)
 add_subdirectory(gbalink EXCLUDE_FROM_ALL)

CMakePresets.json

@@ -288,10 +288,6 @@
       "cacheVariables": {
         "CMAKE_C_COMPILER_LAUNCHER": "buildcache",
         "CMAKE_CXX_COMPILER_LAUNCHER": "buildcache",
-        "BUILD_ATDNA": {
-          "type": "BOOL",
-          "value": false
-        },
         "USE_LTO": {
           "type": "BOOL",
           "value": false

Runtime/CObjectList.cpp

@@ -1,6 +1,7 @@
 #include "Runtime/CObjectList.hpp"
 #ifndef NDEBUG
 #include "Runtime/Logging.hpp"
+#include "Runtime/Formatting.hpp"
 #endif
 
 namespace metaforce {

Runtime/CStateManager.cpp

@@ -1435,7 +1435,7 @@ std::pair<TEditorId, TUniqueId> CStateManager::LoadScriptObject(TAreaId aid, ESc
     return {kInvalidEditorId, kInvalidUniqueId};
   } else {
 #ifndef NDEBUG
-    LogModule.report(logvisor::Info, "Loaded {} in area {}", ent->GetName(), ent->GetAreaIdAlways());
+    spdlog::info("Loaded {} in area {}", ent->GetName(), ent->GetAreaIdAlways());
 #endif
     return {id, ent->GetUniqueId()};
   }

Runtime/GuiSys/CGuiFrame.cpp

@@ -11,6 +11,7 @@
 #include "Runtime/GuiSys/CGuiWidget.hpp"
 #include "Runtime/GuiSys/CGuiWidgetDrawParms.hpp"
 #include "Runtime/Input/CFinalInput.hpp"
+#include "Runtime/Formatting.hpp"
 
 #include <zeus/CColor.hpp>
 

Runtime/Particle/CElementGen.cpp

@@ -14,6 +14,7 @@
 #include "Runtime/Particle/CSwooshDescription.hpp"
 #include "Runtime/Particle/CWarp.hpp"
 #include "Runtime/Logging.hpp"
+#include "Runtime/Formatting.hpp"
 
 #define MAX_GLOBAL_PARTICLES 2560
 

Runtime/Particle/CParticleElectric.cpp

@@ -12,6 +12,7 @@
 #include "Runtime/Particle/CParticleGlobals.hpp"
 #include "Runtime/Particle/CParticleSwoosh.hpp"
 #include "Runtime/Particle/CSwooshDescription.hpp"
+#include "Runtime/Formatting.hpp"
 
 #include <zeus/CQuaternion.hpp>
 #include <zeus/CRelAngle.hpp>

Runtime/Particle/CParticleSwoosh.cpp

@@ -4,6 +4,7 @@
 #include "Runtime/Graphics/CCubeRenderer.hpp"
 #include "Runtime/Particle/CParticleGlobals.hpp"
 #include "Runtime/Particle/CSwooshDescription.hpp"
+#include "Runtime/Formatting.hpp"
 
 #include <chrono>
 

Runtime/Weapon/CEnergyProjectile.cpp

@@ -11,6 +11,7 @@
 #include "Runtime/World/CPlayer.hpp"
 #include "Runtime/World/CScriptPlatform.hpp"
 #include "Runtime/World/CWorld.hpp"
+#include "Runtime/Formatting.hpp"
 
 #include "TCastTo.hpp" // Generated file, do not modify include path
 

Runtime/World/CActor.cpp

@@ -13,6 +13,7 @@
 #include "Runtime/Graphics/CSkinnedModel.hpp"
 #include "Runtime/World/CActorParameters.hpp"
 #include "Runtime/World/CWorld.hpp"
+#include "Runtime/Formatting.hpp"
 
 #include "TCastTo.hpp" // Generated file, do not modify include path
 

Runtime/World/CFishCloud.cpp

@@ -10,6 +10,7 @@
 #include "Runtime/World/CActorParameters.hpp"
 #include "Runtime/World/CPlayer.hpp"
 #include "Runtime/World/CWorld.hpp"
+#include "Runtime/Formatting.hpp"
 
 #include "TCastTo.hpp" // Generated file, do not modify include path
 

Runtime/World/CPlayer.cpp

@@ -30,6 +30,7 @@
 #include "Runtime/World/CScriptPlayerHint.hpp"
 #include "Runtime/World/CScriptWater.hpp"
 #include "Runtime/Logging.hpp"
+#include "Runtime/Formatting.hpp"
 
 #include "TCastTo.hpp" // Generated file, do not modify include path
 
@@ -3941,7 +3942,7 @@ void CPlayer::SetOrbitState(EPlayerOrbitState state, CStateManager& mgr) {
 #ifndef NDEBUG
     if (x310_orbitTargetId != kInvalidUniqueId) {
       if (const CEntity* ent = mgr.GetObjectById(x310_orbitTargetId)) {
-        Log.report(logvisor::Info, "Orbiting {} {}", ent->GetEditorId(), ent->GetName());
+        spdlog::info("Orbiting {} {}", ent->GetEditorId(), ent->GetName());
       }
     }
 #endif

Runtime/World/CScriptGunTurret.cpp

@@ -15,6 +15,7 @@
 #include "Runtime/World/CAiFuncMap.hpp"
 #include "Runtime/World/CGameLight.hpp"
 #include "Runtime/World/CPlayer.hpp"
+#include "Runtime/Formatting.hpp"
 
 #include "TCastTo.hpp" // Generated file, do not modify include path
 

Runtime/World/CScriptTrigger.cpp

@@ -6,6 +6,7 @@
 #include "Runtime/World/CActorParameters.hpp"
 #include "Runtime/World/CPlayer.hpp"
 #include "Runtime/Logging.hpp"
+#include "Runtime/Formatting.hpp"
 #include "TCastTo.hpp" // Generated file, do not modify include path
 
 namespace metaforce {
@@ -24,10 +25,10 @@ CScriptTrigger::CScriptTrigger(TUniqueId uid, std::string_view name, const CEnti
 , x148_27_deactivateOnExited(deactivateOnExited) {
   SetCallTouch(false);
 #ifndef NDEBUG
-  // HACK: For some reason MetroidPrime's lair doesn't enable this trigger until after the cutscene, activate it in debug build
+  // HACK: For some reason MetroidPrime's lair doesn't enable this trigger until after the cutscene, activate it in
+  // debug build
   if (GetEditorId() == 0x000B01DB && !GetActive()) {
-    Log.report(logvisor::Warning, "BUG THIS!: Overriding active for trigger {} in area {}", GetEditorId(),
+    spdlog::warn("BUG THIS!: Overriding active for trigger {} in area {}", GetEditorId(), GetAreaIdAlways());
-               GetAreaIdAlways());
     SetActive(true);
   }
 #endif

Runtime/World/CWallCrawlerSwarm.cpp

@@ -22,6 +22,7 @@
 #include "Runtime/World/CScriptDoor.hpp"
 #include "Runtime/World/CScriptWaypoint.hpp"
 #include "Runtime/World/CWorld.hpp"
+#include "Runtime/Formatting.hpp"
 
 #include "TCastTo.hpp" // Generated file, do not modify include path
 

Runtime/rstl.hpp

@@ -8,15 +8,11 @@
 #include <iterator>
 
 #ifndef NDEBUG
-#include <logvisor/logvisor.hpp>
+#include "Runtime/Logging.hpp"
 #endif
 
 namespace rstl {
 
-#ifndef NDEBUG
-static logvisor::Module Log("rstl");
-#endif
-
 /**
  * @brief Base vector backed by statically-allocated array
  */

extern/aurora

@@ -1 +1 @@
-Subproject commit b07d55f71d7d43099d537d23db1d9cfafd87b175
+Subproject commit 1016fbb36d5479cbad909323d083ed232063a7a5