diff options
| author | Oz Linden <oz@lindenlab.com> | 2019-07-16 18:17:23 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2019-07-16 18:17:23 -0400 |
| commit | 4cbef35f503bb7ee8f489b354e4afb2350085709 (patch) | |
| tree | 8b64783c20b1bf20d7ec9e3c6dc5705a059d8eab /indra | |
| parent | f87e1a43b803d8d84ab0ff6683985c0f604522ff (diff) | |
update Vivox for VOICE-56
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/cmake/Copy3rdPartyLibs.cmake | 2 | ||||
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index dde53835fb..808b4601fb 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -173,7 +173,6 @@ elseif(DARWIN) set(vivox_files SLVoice libortp.dylib - libvivoxplatform.dylib libvivoxsdk.dylib ) set(debug_src_dir "${ARCH_PREBUILT_DIRS_DEBUG}") @@ -211,7 +210,6 @@ elseif(LINUX) libsndfile.so.1 libortp.so libvivoxoal.so.1 - libvivoxplatform.so libvivoxsdk.so SLVoice ) diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index f56dd461d8..8a38f3a742 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -1036,7 +1036,6 @@ class DarwinManifest(ViewerManifest): for libfile in ( 'libortp.dylib', 'libvivoxsdk.dylib', - 'libvivoxplatform.dylib', 'SLVoice', ): self.path2basename(relpkgdir, libfile) @@ -1532,7 +1531,6 @@ class Linux_i686_Manifest(LinuxManifest): self.path("libsndfile.so.1") #self.path("libvivoxoal.so.1") # no - we'll re-use the viewer's own OpenAL lib self.path("libvivoxsdk.so") - self.path("libvivoxplatform.so") self.strip_binaries() |