From b99fcdb30ab65be55aefadaa187849525f189500 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Thu, 13 Feb 2020 21:44:46 +0200 Subject: SL-12707 Build Fails Without FMOD Also adds correct working directory to RelWithDebInfoOS and enables OpenAl on OS builds for windows --- indra/llaudio/CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'indra/llaudio') diff --git a/indra/llaudio/CMakeLists.txt b/indra/llaudio/CMakeLists.txt index e943dd5d5c..b9637c4494 100644 --- a/indra/llaudio/CMakeLists.txt +++ b/indra/llaudio/CMakeLists.txt @@ -60,6 +60,10 @@ if (FMODEX) endif (FMODEX) if (OPENAL) + include_directories( + ${OPENAL_LIBRARIES} + ) + list(APPEND llaudio_SOURCE_FILES llaudioengine_openal.cpp lllistener_openal.cpp -- cgit v1.2.3 From 846d0d337145597eb98e1e107a273622a183f133 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Fri, 5 Jun 2020 17:25:01 +0300 Subject: SL-13390 Fix Openal Builds --- indra/llaudio/llaudioengine_openal.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/llaudio') diff --git a/indra/llaudio/llaudioengine_openal.cpp b/indra/llaudio/llaudioengine_openal.cpp index a38d8291fa..3bdd0302ee 100644 --- a/indra/llaudio/llaudioengine_openal.cpp +++ b/indra/llaudio/llaudioengine_openal.cpp @@ -55,7 +55,7 @@ LLAudioEngine_OpenAL::~LLAudioEngine_OpenAL() bool LLAudioEngine_OpenAL::init(const S32 num_channels, void* userdata, const std::string &app_title) { mWindGen = NULL; - LLAudioEngine::init(num_channels, userdata); + LLAudioEngine::init(num_channels, userdata, app_title); if(!alutInit(NULL, NULL)) { -- cgit v1.2.3