aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden
diff options
context:
space:
mode:
authorArmin Weatherwax2010-08-27 20:27:05 +0200
committerMcCabe Maxsted2010-08-28 05:02:04 -0700
commite4986c211143bfc402581938ec3952669f3927ce (patch)
tree818f5f3367cdffe3b4f5330ffd53567518b07a09 /linden
parentFixed terminology in VivoxLicenseAccepted help string. (diff)
downloadmeta-impy-e4986c211143bfc402581938ec3952669f3927ce.zip
meta-impy-e4986c211143bfc402581938ec3952669f3927ce.tar.gz
meta-impy-e4986c211143bfc402581938ec3952669f3927ce.tar.bz2
meta-impy-e4986c211143bfc402581938ec3952669f3927ce.tar.xz
Added Vivox files to Linux64 manifest.
Diffstat (limited to 'linden')
-rwxr-xr-xlinden/indra/newview/viewer_manifest.py16
1 files changed, 11 insertions, 5 deletions
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index ec3b95c..2f509b6 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -1127,11 +1127,17 @@ class Linux_x86_64Manifest(LinuxManifest):
1127# self.path("libuuid.so.1") 1127# self.path("libuuid.so.1")
1128# self.end_prefix("lib32") 1128# self.end_prefix("lib32")
1129 1129
1130 # Vivox runtimes 1130
1131# if self.prefix(src="vivox-runtime/i686-linux", dst="bin"): 1131 # Vivox runtimes and libs
1132# self.path("SLVoice") 1132 if self.prefix(src="vivox-runtime/i686-linux", dst="bin"):
1133# self.end_prefix() 1133 self.path("SLVoice")
1134# 1134 self.end_prefix("bin")
1135
1136 if self.prefix(src="vivox-runtime/i686-linux", dst="lib32"):
1137 self.path("libalut.so")
1138 self.path("libortp.so")
1139 self.path("libvivoxsdk.so")
1140 self.end_prefix("lib32")
1135 1141
1136if __name__ == "__main__": 1142if __name__ == "__main__":
1137 main() 1143 main()