Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removed the loading of the legacy system_<platform>_<asset_platform>.cfg files #13721

Merged
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
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>
  • Loading branch information
lemonade-dm committed Jan 7, 2023
commit bf51caeafbb4f04eab25806438f504f0f4bdc21a
1 change: 0 additions & 1 deletion Code/Legacy/CrySystem/System.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
24 changes: 0 additions & 24 deletions Code/Legacy/CrySystem/SystemInit.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
{
Expand Down Expand Up @@ -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");

Expand Down
19 changes: 0 additions & 19 deletions system_android_android.cfg

This file was deleted.

28 changes: 0 additions & 28 deletions system_ios_ios.cfg

This file was deleted.

24 changes: 0 additions & 24 deletions system_linux_pc.cfg

This file was deleted.

19 changes: 0 additions & 19 deletions system_mac_mac.cfg

This file was deleted.

18 changes: 0 additions & 18 deletions system_windows_pc.cfg

This file was deleted.