diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-09-22 22:51:33 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-09-22 22:51:33 +0300 |
| commit | 730af5d4888653ce2ccb4bae6dd3919619d58a30 (patch) | |
| tree | b9b5f7f7b9bfdca690c317dc8c90a23f0a2dd1bf /indra/llaudio | |
| parent | bdedfb3755d54a6b4468a5251c9ddeae2b092d37 (diff) | |
| parent | 60ed688026269568a9eef67437dc780f88c92871 (diff) | |
Merged master (DRTVWR-503) into DRTVWR-482
Diffstat (limited to 'indra/llaudio')
| -rw-r--r-- | indra/llaudio/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | indra/llaudio/llaudioengine_openal.cpp | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/indra/llaudio/CMakeLists.txt b/indra/llaudio/CMakeLists.txt index 8b628a058e..558ede7bf6 100644 --- a/indra/llaudio/CMakeLists.txt +++ b/indra/llaudio/CMakeLists.txt @@ -60,6 +60,10 @@ if (FMODSTUDIO) endif (FMODSTUDIO) if (OPENAL) + include_directories( + ${OPENAL_LIBRARIES} + ) + list(APPEND llaudio_SOURCE_FILES llaudioengine_openal.cpp lllistener_openal.cpp 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)) { |