diff options
| author | Armin Weatherwax | 2010-02-27 17:41:47 +0100 |
|---|---|---|
| committer | Jacek Antonelli | 2010-02-27 13:24:32 -0600 |
| commit | 30945b74c3cb64bb11fdb09116c8c8e6e15c94e7 (patch) | |
| tree | fb12e3ff2f5209372ea137ea9d1a26547fc32408 /linden/indra/newview/viewer_manifest.py | |
| parent | Updated llprimitive/llprimitive.cpp to SL 1.23. (diff) | |
| download | meta-impy-30945b74c3cb64bb11fdb09116c8c8e6e15c94e7.zip meta-impy-30945b74c3cb64bb11fdb09116c8c8e6e15c94e7.tar.gz meta-impy-30945b74c3cb64bb11fdb09116c8c8e6e15c94e7.tar.bz2 meta-impy-30945b74c3cb64bb11fdb09116c8c8e6e15c94e7.tar.xz | |
Some changes to help linux64.
* Don't build with libELFIO (lib not working).
* Use shared libpng12 instead of static library
(fixes mozlib incompat for users with system libpng14).
Diffstat (limited to 'linden/indra/newview/viewer_manifest.py')
| -rwxr-xr-x | linden/indra/newview/viewer_manifest.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py index b32d31c..84ecc74 100755 --- a/linden/indra/newview/viewer_manifest.py +++ b/linden/indra/newview/viewer_manifest.py | |||
| @@ -1008,8 +1008,9 @@ class Linux_x86_64Manifest(LinuxManifest): | |||
| 1008 | self.path("libssl.so.0.9.8") | 1008 | self.path("libssl.so.0.9.8") |
| 1009 | self.path("libuuid.so", "libuuid.so.1") | 1009 | self.path("libuuid.so", "libuuid.so.1") |
| 1010 | self.path("libSDL-1.2.so.0") | 1010 | self.path("libSDL-1.2.so.0") |
| 1011 | self.path("libELFIO.so") | 1011 | # self.path("libELFIO.so") |
| 1012 | self.path("libjpeg.so.7") | 1012 | self.path("libjpeg.so.7") |
| 1013 | self.path("libpng12.so.0") | ||
| 1013 | self.path("libopenjpeg.so.2") | 1014 | self.path("libopenjpeg.so.2") |
| 1014 | self.path("libxml2.so.2") | 1015 | self.path("libxml2.so.2") |
| 1015 | self.path("libz.so.1") | 1016 | self.path("libz.so.1") |