Merge remote-tracking branch 'upstream/main' into DisableAtomShim

2021-04-23 18:35:18 -05:00
parent f750a491c8 4abe63e046
commit bc40dd7e5e
4379 changed files with 30092 additions and 39185 deletions
@@ -11,4 +11,4 @@

 set(pal_dir ${LY_ROOT_FOLDER}/LauncherGenerator/Platform/${PAL_PLATFORM_NAME})
 include(${pal_dir}/LauncherUnified_traits_${PAL_PLATFORM_NAME_LOWERCASE}.cmake)
-include(${LY_ROOT_FOLDER}/LauncherGenerator/launcher_generator.cmake)
+include(${LY_ROOT_FOLDER}/LauncherGenerator/launcher_generator.cmake)
@@ -11,4 +11,4 @@
 */
 #pragma once

-#include <Launcher_Traits_Android.h>
+#include <Launcher_Traits_Android.h>
@@ -31,4 +31,4 @@ namespace O3DELauncher

        return pathToAssets;
    }
-}
+}
@@ -11,4 +11,4 @@
 */
 #pragma once

-#include <Launcher_Traits_Linux.h>
+#include <Launcher_Traits_Linux.h>
@@ -11,4 +11,4 @@
 */
 #pragma once

-#include <Launcher_Traits_Mac.h>
+#include <Launcher_Traits_Mac.h>
@@ -4,4 +4,4 @@
      <dpiAware>true</dpiAware>
    </asmv3:windowsSettings>
  </asmv3:application>
-</assembly>
+</assembly>
@@ -10,4 +10,4 @@
 *
 */

-IDI_ICON1 ICON DISCARDABLE "@ICON_FILE@"
+IDI_ICON1 ICON DISCARDABLE "@ICON_FILE@"
@@ -11,4 +11,4 @@
 */
 #pragma once

-#include <Launcher_Traits_Windows.h>
+#include <Launcher_Traits_Windows.h>
@@ -11,4 +11,4 @@

 set(FILES
    Launcher_Game_Windows.cpp
-)
+)
@@ -11,4 +11,4 @@
 */
 #pragma once

-#include <Launcher_Traits_iOS.h>
+#include <Launcher_Traits_iOS.h>
@@ -63,4 +63,4 @@ add_custom_command(TARGET ${project_name}.GameLauncher POST_BUILD
    WORKING_DIRECTORY ${layout_tool_dir}
    COMMENT "Synchronizing Layout Assets ..."
    VERBATIM
-)
+)
@@ -202,4 +202,4 @@ foreach(project_name project_path IN ZIP_LISTS LY_PROJECTS_TARGET_NAME LY_PROJEC

    endif()

-endforeach()
+endforeach()