summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2015-01-21 08:29:21 -0500
committerNat Goodspeed <nat@lindenlab.com>2015-01-21 08:29:21 -0500
commitb349bcf2b6da06bd293adce99dbb6346b9d94cd0 (patch)
treeb9e237939d7d3392c5977c700b7b2720a922f342 /indra
parentfd478424359d3e6081c444aa273c9e30a8b402db (diff)
parent93fe221208399e47333fa9c696c60c3e0ad3eebb (diff)
Merge fix for copying Linux Vivox files
Diffstat (limited to 'indra')
-rwxr-xr-xindra/cmake/Copy3rdPartyLibs.cmake10
-rwxr-xr-xindra/newview/viewer_manifest.py8
2 files changed, 9 insertions, 9 deletions
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index a1a9ff55f5..28202f85d6 100755
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -233,11 +233,11 @@ elseif(LINUX)
set(vivox_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
set(vivox_files
- libsndfile.dylib
- libortp.dylib
- libvivoxoal.dylib
- libvivoxplatform.dylib
- libvivoxsdk.dylib
+ libsndfile.so.1
+ libortp.so
+ libvivoxoal.so.1
+ libvivoxplatform.so
+ libvivoxsdk.so
SLVoice
# ca-bundle.crt #No cert for linux. It is actually still 3.2SDK.
)
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 954e454080..5b03cd83ca 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -1127,11 +1127,11 @@ class Linux_i686_Manifest(LinuxManifest):
self.path("SLVoice")
self.end_prefix()
if self.prefix(src="../packages/lib/release", dst="lib"):
- self.path("libortp.dylib")
- self.path("libsndfile.dylib")
+ self.path("libortp.so")
+ self.path("libsndfile.so.1")
#self.path("libvivoxoal.so.1") # no - we'll re-use the viewer's own OpenAL lib
- self.path("libvivoxsdk.dylib")
- self.path("libvivoxplatform.dylib")
+ self.path("libvivoxsdk.so")
+ self.path("libvivoxplatform.so")
self.end_prefix("lib")
# plugin runtime