From 93fe221208399e47333fa9c696c60c3e0ad3eebb Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Wed, 21 Jan 2015 08:28:33 -0500 Subject: Backed out changeset 1e36e0629994 copying .dylibs on Linux The .dylib files in the Linux Vivox package were erroneous to start with; while the affected changeset bypassed copy errors, it too was wrong. Now that the Linux Vivox package contains Linux .so files, revert to the correct filenames to copy. --- indra/newview/viewer_manifest.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index c360fc32ac..2394dd26b9 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.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 -- cgit v1.2.3