diff options
author | Oz Linden <oz@lindenlab.com> | 2014-12-22 16:43:28 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2014-12-22 16:43:28 -0500 |
commit | 707e51629ec2d540871cb625a7293c1fdebcebcf (patch) | |
tree | 7f526c5f7daf09ad52613d0c8ae974c3691d78ab | |
parent | 111900150d7e80f4f97f26ceb413aea2a5965d73 (diff) |
update libs to match vivox distribution
-rwxr-xr-x | indra/cmake/Copy3rdPartyLibs.cmake | 10 | ||||
-rwxr-xr-x | indra/newview/viewer_manifest.py | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 28202f85d6..a1a9ff55f5 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.so.1 - libortp.so - libvivoxoal.so.1 - libvivoxplatform.so - libvivoxsdk.so + libsndfile.dylib + libortp.dylib + libvivoxoal.dylib + libvivoxplatform.dylib + libvivoxsdk.dylib 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 2394dd26b9..c360fc32ac 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -1154,11 +1154,11 @@ class Linux_i686_Manifest(LinuxManifest): self.path("SLVoice") self.end_prefix() if self.prefix(src="../packages/lib/release", dst="lib"): - self.path("libortp.so") - self.path("libsndfile.so.1") + self.path("libortp.dylib") + self.path("libsndfile.dylib") #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.path("libvivoxsdk.dylib") + self.path("libvivoxplatform.dylib") self.end_prefix("lib") # plugin runtime |