diff options
author | Robin Cornelius | 2010-10-09 10:23:52 +0100 |
---|---|---|
committer | McCabe Maxsted | 2010-10-09 02:36:28 -0700 |
commit | 795d263a3acf18d12d67309d235390093e902853 (patch) | |
tree | f4f5551c1b4f5273b727d14f9100e628334359db /linden/indra/newview/viewer_manifest.py | |
parent | Add a fall back to find NSIS on win64 (diff) | |
download | meta-impy-795d263a3acf18d12d67309d235390093e902853.zip meta-impy-795d263a3acf18d12d67309d235390093e902853.tar.gz meta-impy-795d263a3acf18d12d67309d235390093e902853.tar.bz2 meta-impy-795d263a3acf18d12d67309d235390093e902853.tar.xz |
Fix tab/space issues in viewer_manifest.py
Diffstat (limited to '')
-rwxr-xr-x | linden/indra/newview/viewer_manifest.py | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py index f01cd7a..ff59aec 100755 --- a/linden/indra/newview/viewer_manifest.py +++ b/linden/indra/newview/viewer_manifest.py | |||
@@ -845,7 +845,7 @@ class LinuxManifest(ViewerManifest): | |||
845 | self.path("wrapper.sh","imprudence") | 845 | self.path("wrapper.sh","imprudence") |
846 | self.path("handle_secondlifeprotocol.sh") | 846 | self.path("handle_secondlifeprotocol.sh") |
847 | self.path("register_secondlifeprotocol.sh") | 847 | self.path("register_secondlifeprotocol.sh") |
848 | self.path("getvoice.sh") | 848 | self.path("getvoice.sh") |
849 | self.end_prefix("linux_tools") | 849 | self.end_prefix("linux_tools") |
850 | 850 | ||
851 | self.gather_documents() | 851 | self.gather_documents() |
@@ -974,7 +974,7 @@ class Linux_i686Manifest(LinuxManifest): | |||
974 | self.path("libgstvideo-0.10.so.0") | 974 | self.path("libgstvideo-0.10.so.0") |
975 | 975 | ||
976 | # Gstreamer plugin dependencies | 976 | # Gstreamer plugin dependencies |
977 | self.path("libfaad.so.0") | 977 | self.path("libfaad.so.0") |
978 | self.path("libogg.so.0") | 978 | self.path("libogg.so.0") |
979 | self.path("libtheora.so.0") | 979 | self.path("libtheora.so.0") |
980 | self.path("libvorbis.so.0") | 980 | self.path("libvorbis.so.0") |
@@ -1124,7 +1124,7 @@ class Linux_x86_64Manifest(LinuxManifest): | |||
1124 | self.path("libgstdecodebin2.so") | 1124 | self.path("libgstdecodebin2.so") |
1125 | self.path("libgstdecodebin.so") | 1125 | self.path("libgstdecodebin.so") |
1126 | self.path("libgstesd.so") | 1126 | self.path("libgstesd.so") |
1127 | self.path("libgstfaad.so") | 1127 | self.path("libgstfaad.so") |
1128 | self.path("libgstffmpeg.so") | 1128 | self.path("libgstffmpeg.so") |
1129 | self.path("libgstffmpegcolorspace.so") | 1129 | self.path("libgstffmpegcolorspace.so") |
1130 | self.path("libgstgnomevfs.so") | 1130 | self.path("libgstgnomevfs.so") |
@@ -1162,14 +1162,14 @@ class Linux_x86_64Manifest(LinuxManifest): | |||
1162 | self.path("libortp.so") | 1162 | self.path("libortp.so") |
1163 | self.path("libvivoxsdk.so") | 1163 | self.path("libvivoxsdk.so") |
1164 | self.end_prefix("lib32") | 1164 | self.end_prefix("lib32") |
1165 | 1165 | ||
1166 | # 32bit libs needed for voice | 1166 | # 32bit libs needed for voice |
1167 | if self.prefix("../../libraries/x86_64-linux/lib_release_client/32bit-compat", dst="lib32"): | 1167 | if self.prefix("../../libraries/x86_64-linux/lib_release_client/32bit-compat", dst="lib32"): |
1168 | self.path("libalut.so") | 1168 | self.path("libalut.so") |
1169 | self.path("libidn.so.11") | 1169 | self.path("libidn.so.11") |
1170 | self.path("libopenal.so.1") | 1170 | self.path("libopenal.so.1") |
1171 | # self.path("libortp.so") | 1171 | # self.path("libortp.so") |
1172 | self.path("libuuid.so.1") | 1172 | self.path("libuuid.so.1") |
1173 | self.end_prefix("lib32") | 1173 | self.end_prefix("lib32") |
1174 | 1174 | ||
1175 | if __name__ == "__main__": | 1175 | if __name__ == "__main__": |