summaryrefslogtreecommitdiff
path: root/indra/newview/viewer_manifest.py
diff options
context:
space:
mode:
authoralain@945battery-guestA-183.lindenlab.com <alain@945battery-guestA-183.lindenlab.com>2011-03-25 13:40:26 -0700
committeralain@945battery-guestA-183.lindenlab.com <alain@945battery-guestA-183.lindenlab.com>2011-03-25 13:40:26 -0700
commitff7c3ad97ce0149de04b837fc8ec511be0b51f6d (patch)
tree92d0d1f97a7820e565ec43aae36855a87c3d3bc0 /indra/newview/viewer_manifest.py
parent7986e092ec0a426d1f0e74811772db817d61ec47 (diff)
Backed out changeset 6e69fbe64617
Diffstat (limited to 'indra/newview/viewer_manifest.py')
-rw-r--r--indra/newview/viewer_manifest.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 92b6ff58b2..0de6817072 100644
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -958,6 +958,7 @@ class Linux_i686Manifest(LinuxManifest):
self.path("libopenal.so")
self.path("libopenal.so.1")
self.path("libopenal.so.1.12.854")
+ self.path("libopenal.so", "libvivoxoal.so.1") # vivox's sdk expects this soname
self.path("libfontconfig.so.1.4.4")
try:
self.path("libfmod-3.75.so")
@@ -974,7 +975,7 @@ class Linux_i686Manifest(LinuxManifest):
if self.prefix(src="../packages/lib/release", dst="lib"):
self.path("libortp.so")
self.path("libsndfile.so.1")
- self.path("libvivoxoal.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.end_prefix("lib")