diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-03-14 18:21:16 +0200 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-03-14 18:38:44 +0200 |
| commit | be820f2eb90519ac0fa8d13be9dc5a798e8bfc7f (patch) | |
| tree | 8965aa6a75c793ee00087e999dbada4ae37ccb4e /indra/cmake | |
| parent | bd3ef8a0ed609e07cf85e98b0410680243dab76f (diff) | |
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.
Diffstat (limited to 'indra/cmake')
| -rw-r--r-- | indra/cmake/Copy3rdPartyLibs.cmake | 6 | ||||
| -rw-r--r-- | indra/cmake/FMODSTUDIO.cmake | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index a8ad51fb11..b20d23cead 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 a58bdf7ef3..8840354ac6 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) |