fix: Linker error with static

- Note: enable global optimization again sometime later...
alphanin9 · Jan 24, 2025 · 201d6f1 · 201d6f1
1 parent a8c4dfb
commit 201d6f1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/src/redscript_api/NewGamePlusSystem.cpp b/src/redscript_api/NewGamePlusSystem.cpp
@@ -1,3 +1,6 @@
+#include <RED4ext/RED4ext.hpp>
+#include <RedLib.hpp>
+
 #include <redscript_api/NewGamePlusSystem.hpp>
 
 #include <RED4ext/Scripting/Natives/Generated/gsm/MainQuest.hpp>
@@ -450,7 +453,6 @@ void mod::NewGamePlusSystem::OnGamePrepared()
         m_modConfig = settings::GetModSettings();
     }
 
-
     // If we haven't restored, update NG+ config
     if (!m_restoredDataFromSave)
     {

diff --git a/src/redscript_api/NewGamePlusSystem.hpp b/src/redscript_api/NewGamePlusSystem.hpp
@@ -71,7 +71,7 @@ class NewGamePlusSystem : public Red::IGameSystem
 
 #pragma region Statics
     // Note: Game systems are kept indefinitely, we can cache thisptr from OnInitialize here
-    static NewGamePlusSystem* s_this;
+    static inline NewGamePlusSystem* s_this;
 #pragma endregion
 public:
 #pragma region API
@@ -106,7 +106,6 @@ class NewGamePlusSystem : public Red::IGameSystem
     void RequestResolveNewGamePlusSaves(Red::DynArray<Red::CString> aSaves, Red::WeakHandle<IScriptable> aRef,
                                         Red::CName aCallbackName);
 
-
     void RequestLoadSaveData(Red::CString aSaveName, Red::WeakHandle<IScriptable> aTarget, Red::CName aCallbackName);
 
     void Spew(Red::ScriptRef<Red::CString>& aStr);

diff --git a/xmake.lua b/xmake.lua
@@ -9,7 +9,7 @@ add_cxxflags("/MP /GR- /EHsc")
 set_symbols("debug")
 set_strip("all")
 set_optimize("fastest")
-add_cxxflags("/Zi /Ob2 /Oi /GL")
+add_cxxflags("/Zi /Ob2 /Oi")
 set_runtimes("MD")
 
 add_requires("lz4", "hopscotch-map", "semver", "wil")