livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Debug Fmod with logging" 

This reverts commits b21c17eee9 and 2f78338aeb.
'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.
master
Andrey Kleshchev 2022-03-14 18:21:16 +02:00
parent bd3ef8a0ed
commit be820f2eb9
5 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/cmake/Copy3rdPartyLibs.cmake
View File

@ -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)

6
indra/cmake/FMODSTUDIO.cmake
View File

@ -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)

8
indra/llaudio/llaudioengine_fmodstudio.cpp
View File

@ -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");

4
indra/newview/CMakeLists.txt
View File

@ -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)

10
indra/newview/viewer_manifest.py
View File

@ -517,7 +517,7 @@ class WindowsManifest(ViewerManifest):
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 @@ class DarwinManifest(ViewerManifest):
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 @@ class Linux_i686_Manifest(LinuxManifest):
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")