diff options
| author | Jacek Antonelli | 2010-08-27 12:25:15 -0500 |
|---|---|---|
| committer | McCabe Maxsted | 2010-08-28 05:02:01 -0700 |
| commit | a2a2a3b63635222f91b4813bb3f222a90e8541f6 (patch) | |
| tree | b0717b1afda35e3f64926a7500738f6057c1e2f4 | |
| parent | Fixed terminology in the Vivox agreement window. (diff) | |
| download | meta-impy-a2a2a3b63635222f91b4813bb3f222a90e8541f6.zip meta-impy-a2a2a3b63635222f91b4813bb3f222a90e8541f6.tar.gz meta-impy-a2a2a3b63635222f91b4813bb3f222a90e8541f6.tar.bz2 meta-impy-a2a2a3b63635222f91b4813bb3f222a90e8541f6.tar.xz | |
Added Vivox files to Linux manifest.
| -rwxr-xr-x | linden/indra/newview/viewer_manifest.py | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py index bdbc5ff..0c1f89a 100755 --- a/linden/indra/newview/viewer_manifest.py +++ b/linden/indra/newview/viewer_manifest.py | |||
| @@ -991,10 +991,16 @@ class Linux_i686Manifest(LinuxManifest): | |||
| 991 | 991 | ||
| 992 | self.end_prefix("lib") | 992 | self.end_prefix("lib") |
| 993 | 993 | ||
| 994 | # Vivox runtimes | 994 | # Vivox runtimes and libs |
| 995 | # if self.prefix(src="vivox-runtime/i686-linux", dst="bin"): | 995 | if self.prefix(src="vivox-runtime/i686-linux", dst="bin"): |
| 996 | # self.path("SLVoice") | 996 | self.path("SLVoice") |
| 997 | # self.end_prefix() | 997 | self.end_prefix("bin") |
| 998 | |||
| 999 | if self.prefix(src="vivox-runtime/i686-linux", dst="lib"): | ||
| 1000 | self.path("libalut.so") | ||
| 1001 | self.path("libortp.so") | ||
| 1002 | self.path("libvivoxsdk.so") | ||
| 1003 | self.end_prefix("lib") | ||
| 998 | 1004 | ||
| 999 | 1005 | ||
| 1000 | class Linux_x86_64Manifest(LinuxManifest): | 1006 | class Linux_x86_64Manifest(LinuxManifest): |