diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2015-01-21 08:28:33 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2015-01-21 08:28:33 -0500 |
| commit | 93fe221208399e47333fa9c696c60c3e0ad3eebb (patch) | |
| tree | 1e7c843036f8bac7e4e4cb92f713515962128a5f /indra/newview | |
| parent | 707e51629ec2d540871cb625a7293c1fdebcebcf (diff) | |
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.
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 8 |
1 files changed, 4 insertions, 4 deletions
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 |