fix: Remove static.

Author: paulhazen

lib/NativeCode/DynamicLibraryLoaderHelper/NativeRender/include/Config/PlatformConfig.hpp

@@ -44,13 +44,6 @@ namespace pew::eos::config
      */
     struct PlatformConfig : Config
     {
-    public:
-        
-        /**
-         * \brief Used to statically store the platform specific rtc options once it they been determined.
-         */
-        static inline void* s_platform_specific_rtc_options;
-
         /**
         * \brief The deployment for the platform.
         */
@@ -159,9 +152,14 @@ namespace pew::eos::config
          */
         std::string cache_directory;
 
+        /**
+         * \brief Used to statically store the platform specific rtc options once they have been determined.
+         */
+        void* platform_specific_rtc_options;
+
         virtual void set_cache_directory() = 0;
 
-        virtual void set_platform_specific_rtc_options() const = 0;
+        virtual void set_platform_specific_rtc_options() = 0;
 
         /**
          * \brief Used to store the rtc options once it has been determined.
@@ -289,13 +287,8 @@ namespace pew::eos::config
 
         virtual ~PlatformConfig()
         {
-            // Free the dynamically allocated memory for the platform specific RTC options.
-            if (s_platform_specific_rtc_options)
-                delete s_platform_specific_rtc_options;
-
             // Free the dynamically allocated memory for the rtc options
-            if (rtc_options != nullptr)
-                delete rtc_options;
+            delete rtc_options;
         };
 
     private:
@@ -312,6 +305,7 @@ namespace pew::eos::config
 
         void initialize()
         {
+            set_platform_rtc_options();
             set_cache_directory();
         }
     };

lib/NativeCode/DynamicLibraryLoaderHelper/NativeRender/include/Config/WindowsConfig.hpp

@@ -31,7 +31,10 @@ namespace pew::eos::config
 {
     struct WindowsConfig final : PlatformConfig
     {
-        ~WindowsConfig() = default;
+        ~WindowsConfig() override
+        {
+            delete static_cast<EOS_Windows_RTCOptions*>(platform_specific_rtc_options);
+        }
 
         void set_cache_directory() override
         {
@@ -47,7 +50,7 @@ namespace pew::eos::config
             }
         }
 
-        void set_platform_specific_rtc_options() const override
+        void set_platform_specific_rtc_options() override
         {
             if (rtc_options == nullptr)
             {
@@ -57,9 +60,9 @@ namespace pew::eos::config
 
             if (rtc_options->PlatformSpecificOptions == nullptr)
             {
-                s_platform_specific_rtc_options = new EOS_Windows_RTCOptions();
+                platform_specific_rtc_options = new EOS_Windows_RTCOptions();
 
-                const auto windows_rtc_options = reinterpret_cast<EOS_Windows_RTCOptions*>(s_platform_specific_rtc_options);
+                const auto windows_rtc_options = static_cast<EOS_Windows_RTCOptions*>(platform_specific_rtc_options);
 
                 windows_rtc_options->ApiVersion = EOS_WINDOWS_RTCOPTIONS_API_LATEST;
 
@@ -71,23 +74,22 @@ namespace pew::eos::config
                 }
 
                 size_t len = xaudio2_dll_path.string().size() + 1;
-                s_xaudio2_dll_path = std::unique_ptr<char[]>(new char[len]);
+                _xaudio2_dll_path = std::shared_ptr<char[]>(new char[len]);
 
-                strcpy_s(s_xaudio2_dll_path.get(), len, xaudio2_dll_path.string().c_str());
+                strcpy_s(_xaudio2_dll_path.get(), len, xaudio2_dll_path.string().c_str());
 
-                windows_rtc_options->XAudio29DllPath = s_xaudio2_dll_path.get();
+                windows_rtc_options->XAudio29DllPath = _xaudio2_dll_path.get();
 
-                rtc_options->PlatformSpecificOptions = s_platform_specific_rtc_options;
+                rtc_options->PlatformSpecificOptions = platform_specific_rtc_options;
             }
         }
 
     private:
 
-        static inline std::unique_ptr<char[]> s_xaudio2_dll_path;
+        std::shared_ptr<char[]> _xaudio2_dll_path;
 
         explicit WindowsConfig() : PlatformConfig("eos_windows_config.json") 
         {
-            get_cache_directory();
         }
         // Makes the WindowsConfig constructor accessible to the Config class.
         friend struct Config;