Integrating latest from github/staging

Integrating up through commit 5e1bdae
This commit is contained in:
alexpete
2021-03-26 14:31:50 -07:00
parent 9c54341af8
commit 36c4e827bd
764 changed files with 11453 additions and 20251 deletions
@@ -37,7 +37,6 @@ ly_add_target(
ly_add_target(
NAME ScriptCanvasDeveloper ${PAL_TRAIT_MONOLITHIC_DRIVEN_MODULE_TYPE}
NAMESPACE Gem
OUTPUT_NAME Gem.ScriptCanvasDeveloperGem.f905c05883b94fd6bddc91052c3c5a86.v0.1.0
FILES_CMAKE
scriptcanvasdeveloper_gem_game_files.cmake
INCLUDE_DIRECTORIES
@@ -51,14 +50,15 @@ ly_add_target(
PRIVATE
AZ::AzCore
Gem::ScriptCanvasDeveloper.Static
RUNTIME_DEPENDENCIES
Gem::ScriptCanvas
)
if(PAL_TRAIT_BUILD_HOST_TOOLS)
ly_add_target(
NAME ScriptCanvasDeveloper.Editor MODULE
NAME ScriptCanvasDeveloper.Editor GEM_MODULE
NAMESPACE Gem
AUTOMOC
OUTPUT_NAME Gem.ScriptCanvasDeveloperGem.Editor.f905c05883b94fd6bddc91052c3c5a86.v0.1.0
FILES_CMAKE
scriptcanvasdeveloper_gem_editor_files.cmake
INCLUDE_DIRECTORIES
@@ -79,5 +79,7 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS)
Gem::ScriptCanvasDeveloper.Static
Gem::ScriptCanvas.Editor.Static
Gem::GraphCanvasWidgets
RUNTIME_DEPENDENCIES
Gem::ScriptCanvas.Editor
)
endif()