Remove the use of a .Stub version of the Wwise Gem (#4879)

* Remove the definition of a 'Stub' Wwise Gem

This removes the conditional compilation of a '.Stub' version of the
Wwise Gem.  Now, all we do is not define any of the AudioEngineWwise
targets in CMake whenever Wwise is not available (SDK not found or
platform unsupported).

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Remove the remaining stub files, no longer needed

This removes the files.cmake and stub module cpp files that made up the
.Stub version of this Gem.  These are no longer needed.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
monroegm-disable-blank-issue-2
amzn-phist 4 years ago committed by GitHub
parent 244878483a
commit 50f66bde69
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -18,31 +18,18 @@ set(AUDIOENGINEWWISE_COMPILEDEFINITIONS
find_package(Wwise MODULE) find_package(Wwise MODULE)
################################################################################ ################################################################################
# Server / Unsupported # Servers
# (and situations where Wwise SDK is not found or otherwise unavailable)
################################################################################ ################################################################################
if (PAL_TRAIT_BUILD_SERVER_SUPPORTED OR PAL_TRAIT_AUDIO_ENGINE_WWISE_USE_STUB OR NOT Wwise_FOUND) if(NOT PAL_TRAIT_AUDIO_ENGINE_WWISE_SUPPORTED OR NOT Wwise_FOUND)
# Stub gem for server and unsupported platforms. Audio Engine Wwise is client only # Don't create any Gem targets and aliases. Nothing should depend on this
ly_add_target( # Gem directly, because if it doesn't define targets it will cause an error.
NAME AudioEngineWwise.Stub ${PAL_TRAIT_MONOLITHIC_DRIVEN_MODULE_TYPE}
NAMESPACE Gem
FILES_CMAKE
audioenginewwise_stub_files.cmake
BUILD_DEPENDENCIES
PRIVATE
AZ::AzCore
)
endif()
if (PAL_TRAIT_AUDIO_ENGINE_WWISE_USE_STUB OR NOT Wwise_FOUND)
# setup aliases so stubs will be used if something references AudioEngineWwise(.Editor)
add_library(Gem::AudioEngineWwise ALIAS AudioEngineWwise.Stub)
add_library(Gem::AudioEngineWwise.Editor ALIAS AudioEngineWwise.Stub)
return() return()
endif() endif()
################################################################################ ################################################################################
# Runtime / Game # Clients
################################################################################ ################################################################################
ly_add_target( ly_add_target(
NAME AudioEngineWwise.Static STATIC NAME AudioEngineWwise.Static STATIC
@ -181,7 +168,7 @@ if (PAL_TRAIT_BUILD_TESTS_SUPPORTED)
endif() endif()
################################################################################ ################################################################################
# Tools / Editor # Tools / Builders
################################################################################ ################################################################################
if (PAL_TRAIT_BUILD_HOST_TOOLS) if (PAL_TRAIT_BUILD_HOST_TOOLS)
ly_add_target( ly_add_target(

@ -6,4 +6,4 @@
# #
# #
set(PAL_TRAIT_AUDIO_ENGINE_WWISE_USE_STUB FALSE) set(PAL_TRAIT_AUDIO_ENGINE_WWISE_SUPPORTED TRUE)

@ -6,4 +6,4 @@
# #
# #
set(PAL_TRAIT_AUDIO_ENGINE_WWISE_USE_STUB FALSE) set(PAL_TRAIT_AUDIO_ENGINE_WWISE_SUPPORTED TRUE)

@ -6,4 +6,4 @@
# #
# #
set(PAL_TRAIT_AUDIO_ENGINE_WWISE_USE_STUB FALSE) set(PAL_TRAIT_AUDIO_ENGINE_WWISE_SUPPORTED TRUE)

@ -6,4 +6,4 @@
# #
# #
set(PAL_TRAIT_AUDIO_ENGINE_WWISE_USE_STUB FALSE) set(PAL_TRAIT_AUDIO_ENGINE_WWISE_SUPPORTED TRUE)

@ -6,4 +6,4 @@
# #
# #
set(PAL_TRAIT_AUDIO_ENGINE_WWISE_USE_STUB FALSE) set(PAL_TRAIT_AUDIO_ENGINE_WWISE_SUPPORTED TRUE)

@ -1,11 +0,0 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project.
* For complete copyright and license terms please see the LICENSE at the root of this distribution.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
*/
#include <AzCore/Module/Module.h>
AZ_DECLARE_MODULE_CLASS(Gem_AudioEngineWwise, AZ::Module)

@ -1,11 +0,0 @@
#
# Copyright (c) Contributors to the Open 3D Engine Project.
# For complete copyright and license terms please see the LICENSE at the root of this distribution.
#
# SPDX-License-Identifier: Apache-2.0 OR MIT
#
#
set(FILES
Source/AudioEngineWwiseModule_Stub.cpp
)
Loading…
Cancel
Save