Integrating latest from github/staging

Integrating up through commit 5e1bdae
2021-03-26 14:31:50 -07:00
parent 9c54341af8
commit 36c4e827bd
764 changed files with 11453 additions and 20251 deletions
@@ -30,7 +30,6 @@ ly_add_target(
 ly_add_target(
    NAME AssetMemoryAnalyzer ${PAL_TRAIT_MONOLITHIC_DRIVEN_MODULE_TYPE}
    NAMESPACE Gem
-    OUTPUT_NAME Gem.AssetMemoryAnalyzer.35414634480a4d4c8412c60fe62f4c81.v0.1.0
    FILES_CMAKE
        assetmemoryanalyzer_shared_files.cmake
    INCLUDE_DIRECTORIES
@@ -41,6 +40,8 @@ ly_add_target(
    BUILD_DEPENDENCIES
        PRIVATE
            Gem::AssetMemoryAnalyzer.Static
+    RUNTIME_DEPENDENCIES
+        Gem::ImGui
 )

 ################################################################################