merge stabilization/2106 into development

Signed-off-by: hultonha <hultonha@amazon.co.uk>
This commit is contained in:
hultonha
2021-07-06 17:34:04 +01:00
377 changed files with 6549 additions and 9214 deletions
+3 -6
View File
@@ -22,7 +22,7 @@ ly_add_target(
Source
BUILD_DEPENDENCIES
PRIVATE
Gem::AudioSystem
Gem::AudioSystem.Static
PUBLIC
3rdParty::libsamplerate
Legacy::CryCommon
@@ -39,10 +39,7 @@ ly_add_target(
BUILD_DEPENDENCIES
PRIVATE
Gem::Microphone.Static
RUNTIME_DEPENDENCIES
Gem::AudioSystem
)
# The above "Microphone" target is used by all interactive applications
ly_create_alias(NAME Microphone.Clients NAMESPACE Gem TARGETS Gem::Microphone)
ly_create_alias(NAME Microphone.Tools NAMESPACE Gem TARGETS Gem::Microphone)
ly_create_alias(NAME Microphone.Clients NAMESPACE Gem TARGETS Gem::Microphone Gem::AudioSystem)
ly_create_alias(NAME Microphone.Tools NAMESPACE Gem TARGETS Gem::Microphone Gem::AudioSystem.Editor)