Integrating github/staging through commit ab87ed9

2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
@@ -25,6 +25,7 @@ ly_add_target(
    BUILD_DEPENDENCIES
        PRIVATE
            AZ::AzCore
+            Gem::Atom_AtomBridge.Static
 )

 ################################################################################
@@ -37,6 +38,7 @@ ly_add_project_dependencies(
        AutomatedTesting.GameLauncher
    DEPENDENCIES_FILES
        runtime_dependencies.cmake
+        ${pal_dir}/runtime_dependencies.cmake
 )

 if(PAL_TRAIT_BUILD_HOST_TOOLS)
@@ -0,0 +1,10 @@
+#
+# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+# its licensors.
+#
+# For complete copyright and license terms please see the LICENSE at the root of this
+# distribution (the "License"). All use of this software is governed by the License,
+# or, if provided, by the license below or the license accompanying this file. Do not
+# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#
@@ -0,0 +1,10 @@
+#
+# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+# its licensors.
+#
+# For complete copyright and license terms please see the LICENSE at the root of this
+# distribution (the "License"). All use of this software is governed by the License,
+# or, if provided, by the license below or the license accompanying this file. Do not
+# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#
@@ -0,0 +1,10 @@
+#
+# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+# its licensors.
+#
+# For complete copyright and license terms please see the LICENSE at the root of this
+# distribution (the "License"). All use of this software is governed by the License,
+# or, if provided, by the license below or the license accompanying this file. Do not
+# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#
@@ -0,0 +1,10 @@
+#
+# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+# its licensors.
+#
+# For complete copyright and license terms please see the LICENSE at the root of this
+# distribution (the "License"). All use of this software is governed by the License,
+# or, if provided, by the license below or the license accompanying this file. Do not
+# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#
@@ -0,0 +1,15 @@
+#
+# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+# its licensors.
+#
+# For complete copyright and license terms please see the LICENSE at the root of this
+# distribution (the "License"). All use of this software is governed by the License,
+# or, if provided, by the license below or the license accompanying this file. Do not
+# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#
+
+set(GEM_DEPENDENCIES
+    Gem::Atom_RHI_Vulkan.Private
+    Gem::Atom_RHI_DX12.Private
+)
@@ -11,4 +11,9 @@

 set(GEM_DEPENDENCIES
    Gem::QtForPython.Editor
+    Gem::Atom_RHI_Vulkan.Private
+    Gem::Atom_RHI_Vulkan.Builders
+    Gem::Atom_RHI_DX12.Private
+    Gem::Atom_RHI_DX12.Builders
+    Gem::Atom_RHI_Metal.Builders
 )
@@ -0,0 +1,10 @@
+#
+# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+# its licensors.
+#
+# For complete copyright and license terms please see the LICENSE at the root of this
+# distribution (the "License"). All use of this software is governed by the License,
+# or, if provided, by the license below or the license accompanying this file. Do not
+# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#
@@ -0,0 +1,10 @@
+#
+# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+# its licensors.
+#
+# For complete copyright and license terms please see the LICENSE at the root of this
+# distribution (the "License"). All use of this software is governed by the License,
+# or, if provided, by the license below or the license accompanying this file. Do not
+# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#
@@ -21,7 +21,6 @@ set(GEM_DEPENDENCIES
    Gem::Gestures
    Gem::CertificateManager
    Gem::DebugDraw
-    Gem::GameLift
    Gem::AudioSystem
    Gem::InAppPurchases
    Gem::AutomatedTesting
@@ -43,4 +42,16 @@ set(GEM_DEPENDENCIES
    Gem::SurfaceData
    Gem::GradientSignal
    Gem::Vegetation
+
+    Gem::Atom_RHI.Private
+    Gem::Atom_RPI.Private
+    Gem::Atom_Feature_Common
+    Gem::Atom_Bootstrap
+    Gem::Atom_Component_DebugCamera
+    Gem::AtomImGuiTools
+    Gem::AtomLyIntegration_CommonFeatures
+    Gem::EMotionFX_Atom
+    Gem::ImguiAtom
+    Gem::Atom_AtomBridge
+    Gem::AtomFont
 )
@@ -21,7 +21,6 @@ set(GEM_DEPENDENCIES
    Gem::Gestures
    Gem::CertificateManager
    Gem::DebugDraw.Editor
-    Gem::GameLift
    Gem::SceneProcessing.Editor
    Gem::GraphCanvas.Editor
    Gem::InAppPurchases
@@ -30,7 +29,6 @@ set(GEM_DEPENDENCIES
    Gem::PythonAssetBuilder.Editor
    Gem::Metastream
    Gem::AudioSystem.Editor
-    Gem::ImageProcessing.Editor
    Gem::Camera.Editor
    Gem::EMotionFX.Editor
    Gem::PhysX.Editor
@@ -52,4 +50,22 @@ set(GEM_DEPENDENCIES
    Gem::Vegetation.Editor
    Gem::GraphModel.Editor
    Gem::LandscapeCanvas.Editor
+    Gem::Atom_RHI.Private
+    Gem::EMotionFX.Editor
+    Gem::Atom_RPI.Builders
+    Gem::Atom_RPI.Editor
+    Gem::Atom_Feature_Common.Builders
+    Gem::Atom_Feature_Common.Editor
+    Gem::ImGui.Editor
+    Gem::Atom_Bootstrap
+    Gem::Atom_Asset_Shader.Builders
+    Gem::Atom_Component_DebugCamera
+    Gem::AtomImGuiTools
+    Gem::AtomLyIntegration_CommonFeatures.Editor
+    Gem::EMotionFX_Atom.Editor
+    Gem::ImageProcessingAtom.Editor
+    Gem::Atom_AtomBridge.Editor
+    Gem::ImguiAtom
+    Gem::AtomFont
+    Gem::AtomToolsFramework.Editor
 )