birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ATOM-16346 Change Atom setreg path (#3690)

Browse Source 
* Changed path Amazon to O3DE. Fixed issues that setreg is not loaded in game launchers.

Signed-off-by: jiaweig <jiaweig@amazon.com>

* Add brackets.

Signed-off-by: jiaweig <jiaweig@amazon.com>
This commit is contained in:
jiaweig
2021-08-30 14:57:46 -07:00
committed by GitHub
parent cdcdcb0777
commit a7309cf2eb
12 changed files with 40 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Framework/AzGameFramework/AzGameFramework/Application/GameApplication.cpp
+6
View File
@@ -55,6 +55,12 @@ namespace AzGameFramework
AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_TargetBuildDependencyRegistry(registry, AZ_TRAIT_OS_PLATFORM_CODENAME, specializations, &scratchBuffer);
#if AZ_TRAIT_OS_IS_HOST_OS_PLATFORM && (defined (AZ_DEBUG_BUILD) || defined(AZ_PROFILE_BUILD))
AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_EngineRegistry(registry, AZ_TRAIT_OS_PLATFORM_CODENAME, specializations, &scratchBuffer);
AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_GemRegistries(registry, AZ_TRAIT_OS_PLATFORM_CODENAME, specializations, &scratchBuffer);
AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_ProjectRegistry(registry, AZ_TRAIT_OS_PLATFORM_CODENAME, specializations, &scratchBuffer);
#endif
// Used the lowercase the platform name since the bootstrap.game.<config>.<platform>.setreg is being loaded
// from the asset cache root where all the files are in lowercased from regardless of the filesystem case-sensitivity
static constexpr char filename[] = "bootstrap.game." AZ_BUILD_CONFIGURATION_TYPE "." AZ_TRAIT_OS_PLATFORM_CODENAME_LOWER ".setreg";