Removed the loading of the legacy

`system_<platform>_<asset_platform>.cfg` files The settings registry has replaced the loading of platform specific setreg files using the Platform Abstraction Layer to determine platform specific folders. This is detailed in the documentation [here](https://www.o3de.org/docs/user-guide/settings/developer-documentation/#specialization-system-in-depth) The settings registry can also issue console commands which is described on the [Issue Console Commands](https://www.o3de.org/docs/user-guide/settings/issue-az-console-commands/) page Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
o3de · Dec 15, 2022 · c966a9d · c966a9d
1 parent fc3dfb4
commit c966a9d
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 133 deletions.
diff --git a/Code/Legacy/CrySystem/System.h b/Code/Legacy/CrySystem/System.h
@@ -449,7 +449,6 @@ class CSystem
     CCmdLine*                                      m_pCmdLine;
 
     AZStd::string  m_currentLanguageAudio;
-    AZStd::string  m_systemConfigName; // computed from system_(hardwareplatform)_(assetsPlatform) - eg, system_android_android.cfg or system_windows_pc.cfg
 
     std::vector< std::pair<CTimeValue, float> > m_updateTimes;
 

diff --git a/Code/Legacy/CrySystem/SystemInit.cpp b/Code/Legacy/CrySystem/SystemInit.cpp
@@ -320,9 +320,6 @@ void CSystem::ShutdownFileSystem()
 /////////////////////////////////////////////////////////////////////////////////
 bool CSystem::InitFileSystem_LoadEngineFolders(const SSystemInitParams&)
 {
-    LoadConfiguration(m_systemConfigName.c_str());
-    AZ_Printf(AZ_TRACE_SYSTEM_WINDOW, "Loading system configuration from %s...", m_systemConfigName.c_str());
-
 #if defined(AZ_PLATFORM_ANDROID)
     AZ::Android::Utils::SetLoadFilesToMemory(m_sys_load_files_to_memory->GetString());
 #endif
@@ -693,25 +690,6 @@ bool CSystem::Init(const SSystemInitParams& startupParams)
         azConsole->LinkDeferredFunctors(AZ::ConsoleFunctorBase::GetDeferredHead());
     }
 
-    if (auto settingsRegistry = AZ::SettingsRegistry::Get(); settingsRegistry)
-    {
-        AZ::SettingsRegistryInterface::FixedValueString assetPlatform;
-        if (!AZ::SettingsRegistryMergeUtils::PlatformGet(*settingsRegistry, assetPlatform,
-            AZ::SettingsRegistryMergeUtils::BootstrapSettingsRootKey, "assets"))
-        {
-            assetPlatform = AzFramework::OSPlatformToDefaultAssetPlatform(AZ_TRAIT_OS_PLATFORM_CODENAME);
-            AZ_Warning(AZ_TRACE_SYSTEM_WINDOW, false, R"(A valid asset platform is missing in "%s/assets" key in the SettingsRegistry.)""\n"
-                R"(This typically done by setting the "assets" field within a .setreg file)""\n"
-                R"(A fallback of %s will be used.)",
-                AZ::SettingsRegistryMergeUtils::BootstrapSettingsRootKey,
-                assetPlatform.c_str());
-        }
-
-        m_systemConfigName = "system_" AZ_TRAIT_OS_PLATFORM_CODENAME_LOWER "_";
-        m_systemConfigName += assetPlatform.c_str();
-        m_systemConfigName += ".cfg";
-    }
-
 #if defined(WIN32) || defined(WIN64)
     // check OS version - we only want to run on XP or higher - talk to Martin Mittring if you want to change this
     {
@@ -918,8 +896,6 @@ AZ_POP_DISABLE_WARNING
         }
 
         {
-            // We have to load this file again since first time we did it without devmode
-            LoadConfiguration(m_systemConfigName.c_str());
             // Optional user defined overrides
             LoadConfiguration("user.cfg");
 

diff --git a/system_android_android.cfg b/system_android_android.cfg
diff --git a/system_ios_ios.cfg b/system_ios_ios.cfg
diff --git a/system_linux_pc.cfg b/system_linux_pc.cfg
diff --git a/system_mac_mac.cfg b/system_mac_mac.cfg
diff --git a/system_windows_pc.cfg b/system_windows_pc.cfg