Merge pull request #1011 from aws-lumberyard-dev/ly-as-sdk/LYN-2948

Integration of the LY as an SDK work

Code/LauncherUnified/Launcher.cpp

@@ -488,8 +488,8 @@ namespace O3DELauncher
         const AZStd::string_view buildTargetName = GetBuildTargetName();
         AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_AddBuildSystemTargetSpecialization(*settingsRegistry, buildTargetName);
 
-        AZ_TracePrintf("Launcher", R"(Running project "%.*s.)" "\n"
-            R"(The project name value has been successfully set in the Settings Registry at key "%s/project_name)"
+        AZ_TracePrintf("Launcher", R"(Running project "%.*s")" "\n"
+            R"(The project name has been successfully set in the Settings Registry at key "%s/project_name")"
             R"( for Launcher target "%.*s")" "\n",
             aznumeric_cast<int>(launcherProjectName.size()), launcherProjectName.data(),
             AZ::SettingsRegistryMergeUtils::ProjectSettingsRootKey,
@@ -643,7 +643,8 @@ namespace O3DELauncher
             if (gEnv && gEnv->pConsole)
             {
                 // Execute autoexec.cfg to load the initial level
-                AZ::Interface<AZ::IConsole>::Get()->ExecuteConfigFile("autoexec.cfg");
+                auto autoExecFile = AZ::IO::FixedMaxPath{pathToAssets} / "autoexec.cfg";
+                AZ::Interface<AZ::IConsole>::Get()->ExecuteConfigFile(autoExecFile.Native());
 
                 // Find out if console command file was passed 
                 // via --console-command-file=%filename% and execute it

Code/LauncherUnified/Platform/Windows/launcher_project_windows.cmake

@@ -10,6 +10,11 @@
 #
 
 set(ICON_FILE ${project_real_path}/Gem/Resources/GameSDK.ico)
+if(NOT EXISTS ${ICON_FILE})
+    # Try another project-relative path
+    set(ICON_FILE ${project_real_path}/Resources/GameSDK.ico)
+endif()
+
 if(NOT EXISTS ${ICON_FILE})
     # Try the common LauncherUnified icon instead
     set(ICON_FILE Resources/GameSDK.ico)