diff options
-rw-r--r-- | ChangeLog.txt | 3 | ||||
-rwxr-xr-x | linden/indra/newview/viewer_manifest.py | 8 |
2 files changed, 5 insertions, 6 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt index bd3131b..303609e 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt | |||
@@ -5,6 +5,9 @@ | |||
5 | 2009-02-02 Jacek Antonelli <jacek.antonelli@gmail.com> | 5 | 2009-02-02 Jacek Antonelli <jacek.antonelli@gmail.com> |
6 | 6 | ||
7 | * linden/indra/newview/viewer_manifest.py: | 7 | * linden/indra/newview/viewer_manifest.py: |
8 | Get AL libs from real libs dir, not vivox. | ||
9 | |||
10 | * linden/indra/newview/viewer_manifest.py: | ||
8 | Removed redundant packaging of text files. | 11 | Removed redundant packaging of text files. |
9 | 12 | ||
10 | 13 | ||
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py index aae05ab..fda0baf 100755 --- a/linden/indra/newview/viewer_manifest.py +++ b/linden/indra/newview/viewer_manifest.py | |||
@@ -668,6 +668,8 @@ class Linux_i686Manifest(LinuxManifest): | |||
668 | self.path("libSDL-1.2.so.0") | 668 | self.path("libSDL-1.2.so.0") |
669 | self.path("libELFIO.so") | 669 | self.path("libELFIO.so") |
670 | self.path("libopenjpeg.so.2") | 670 | self.path("libopenjpeg.so.2") |
671 | self.path("libopenal.so.1") | ||
672 | self.path("libalut.so") | ||
671 | #self.path("libtcmalloc.so.0") - bugged | 673 | #self.path("libtcmalloc.so.0") - bugged |
672 | #self.path("libstacktrace.so.0") - probably bugged | 674 | #self.path("libstacktrace.so.0") - probably bugged |
673 | self.end_prefix("lib") | 675 | self.end_prefix("lib") |
@@ -677,12 +679,6 @@ class Linux_i686Manifest(LinuxManifest): | |||
677 | # self.path("SLVoice") | 679 | # self.path("SLVoice") |
678 | # self.end_prefix() | 680 | # self.end_prefix() |
679 | 681 | ||
680 | if self.prefix(src="vivox-runtime/i686-linux", dst="lib"): | ||
681 | self.path("libopenal.so.1") | ||
682 | self.path("libalut.so") | ||
683 | # self.path("libortp.so") | ||
684 | # self.path("libvivoxsdk.so") | ||
685 | self.end_prefix("lib") | ||
686 | 682 | ||
687 | class Linux_x86_64Manifest(LinuxManifest): | 683 | class Linux_x86_64Manifest(LinuxManifest): |
688 | def construct(self): | 684 | def construct(self): |