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/newview | |
| 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/newview')
| -rw-r--r-- | indra/newview/CMakeLists.txt | 4 | ||||
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index c19be1d2ec..43aea78775 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 527d3941b0..7855a62c87 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -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") |