From be820f2eb90519ac0fa8d13be9dc5a798e8bfc7f Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 14 Mar 2022 18:21:16 +0200
Subject: [PATCH] Revert "Debug Fmod with logging"
This reverts commits b21c17eee973dc06c1392dd45dbc19c1ce394852 and 2f78338aeb3d0297813bc9c9c7a9d75a2055000d.
'Debug Fmod' was not an intended commit, was meant for local testing. But might be a good idea to make this a part of DebWithRelInfo or provide a cmake switch.
---
indra/cmake/Copy3rdPartyLibs.cmake | 6 +++---
indra/cmake/FMODSTUDIO.cmake | 6 +++---
indra/llaudio/llaudioengine_fmodstudio.cpp | 8 --------
indra/newview/CMakeLists.txt | 4 ++--
indra/newview/viewer_manifest.py | 10 +++++-----
5 files changed, 13 insertions(+), 21 deletions(-)
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index a8ad51fb11d..b20d23ceade 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -87,7 +87,7 @@ if(WINDOWS)
if (FMODSTUDIO)
set(debug_files ${debug_files} fmodL.dll)
- set(release_files ${release_files} fmodL.dll)
+ set(release_files ${release_files} fmod.dll)
endif (FMODSTUDIO)
if (OPENAL)
@@ -179,7 +179,7 @@ elseif(DARWIN)
if (FMODSTUDIO)
set(debug_files ${debug_files} libfmodL.dylib)
- set(release_files ${release_files} libfmodL.dylib)
+ set(release_files ${release_files} libfmod.dylib)
endif (FMODSTUDIO)
elseif(LINUX)
@@ -229,7 +229,7 @@ elseif(LINUX)
if (FMODSTUDIO)
set(debug_files ${debug_files} "libfmodL.so")
- set(release_files ${release_files} "libfmodL.so")
+ set(release_files ${release_files} "libfmod.so")
endif (FMODSTUDIO)
else(WINDOWS)
diff --git a/indra/cmake/FMODSTUDIO.cmake b/indra/cmake/FMODSTUDIO.cmake
index a58bdf7ef3c..8840354ac6c 100644
--- a/indra/cmake/FMODSTUDIO.cmake
+++ b/indra/cmake/FMODSTUDIO.cmake
@@ -20,16 +20,16 @@ if (FMODSTUDIO)
if (WINDOWS)
set(FMODSTUDIO_LIBRARY
debug fmodL_vc
- optimized fmodL_vc)
+ optimized fmod_vc)
elseif (DARWIN)
#despite files being called libfmod.dylib, we are searching for fmod
set(FMODSTUDIO_LIBRARY
debug fmodL
- optimized fmodL)
+ optimized fmod)
elseif (LINUX)
set(FMODSTUDIO_LIBRARY
debug fmodL
- optimized fmodL)
+ optimized fmod)
endif (WINDOWS)
set(FMODSTUDIO_LIBRARIES ${FMODSTUDIO_LIBRARY})
set(FMODSTUDIO_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/fmodstudio)
diff --git a/indra/llaudio/llaudioengine_fmodstudio.cpp b/indra/llaudio/llaudioengine_fmodstudio.cpp
index 72d7577ab23..e5752d3dad0 100644
--- a/indra/llaudio/llaudioengine_fmodstudio.cpp
+++ b/indra/llaudio/llaudioengine_fmodstudio.cpp
@@ -97,14 +97,6 @@ bool LLAudioEngine_FMODSTUDIO::init(const S32 num_channels, void* userdata, cons
<< " expected:" << FMOD_VERSION << LL_ENDL;
}
- Check_FMOD_Error(result, "FMOD::System::getVersion");
- std::string logfile = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, "fmod.log");
- result = FMOD::Debug_Initialize(FMOD_DEBUG_LEVEL_LOG, FMOD_DEBUG_MODE_FILE, 0, logfile.c_str());
- if (Check_FMOD_Error(result, "FMOD::System_Create"))
- {
- LL_WARNS() << "Failed to init logging" << LL_ENDL;
- }
-
// In this case, all sounds, PLUS wind and stream will be software.
result = mSystem->setSoftwareChannels(num_channels + 2);
Check_FMOD_Error(result, "FMOD::System::setSoftwareChannels");
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index c19be1d2ec0..43aea787752 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1874,8 +1874,8 @@ if (WINDOWS)
if (FMODSTUDIO)
list(APPEND COPY_INPUT_DEPENDENCIES
- ${SHARED_LIB_STAGING_DIR}/Release/fmodL.dll
- ${SHARED_LIB_STAGING_DIR}/RelWithDebInfo/fmodL.dll
+ ${SHARED_LIB_STAGING_DIR}/Release/fmod.dll
+ ${SHARED_LIB_STAGING_DIR}/RelWithDebInfo/fmod.dll
${SHARED_LIB_STAGING_DIR}/Debug/fmodL.dll
)
endif (FMODSTUDIO)
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 527d3941b09..7855a62c87d 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -517,7 +517,7 @@ def construct(self):
if(self.args['configuration'].lower() == 'debug'):
self.path("fmodL.dll")
else:
- self.path("fmodL.dll")
+ self.path("fmod.dll")
if self.args['openal'] == 'ON':
# Get openal dll
@@ -1051,7 +1051,7 @@ def path_optional(src, dst):
dylibs += path_optional(os.path.join(debpkgdir, libfile), libfile)
else:
for libfile in (
- "libfmodL.dylib",
+ "libfmod.dylib",
):
dylibs += path_optional(os.path.join(relpkgdir, libfile), libfile)
@@ -1545,9 +1545,9 @@ def construct(self):
if self.args['fmodstudio'] == 'ON':
try:
- self.path("libfmodL.so.11.7")
- self.path("libfmodL.so.11")
- self.path("libfmodL.so")
+ self.path("libfmod.so.11.7")
+ self.path("libfmod.so.11")
+ self.path("libfmod.so")
pass
except:
print("Skipping libfmod.so - not found")
--
GitLab