diff options
| author | jenn <jenn@lindenlab.com> | 2011-01-20 14:33:45 -0800 |
|---|---|---|
| committer | jenn <jenn@lindenlab.com> | 2011-01-20 14:33:45 -0800 |
| commit | d4df4c46c37c416684076e826e1d0b8d13a6830c (patch) | |
| tree | d2b48a76761e85e6775f53cc0659c401eba805e3 /indra/newview | |
| parent | ea8c2b1fa19804ecc55de0274cdd53eceb7f73ce (diff) | |
| parent | 1ec7b651e1090089ce91599eed4143ba8e978a43 (diff) | |
Automated merge with https://bitbucket.org/mani_linden/viewer-autobuild
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/viewer_manifest.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 2afd1fc1af..b803a55110 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -923,7 +923,7 @@ class Linux_i686Manifest(LinuxManifest): def construct(self): super(Linux_i686Manifest, self).construct() - if self.prefix("../../libraries/i686-linux/lib_release_client", dst="lib"): + if self.prefix("../packages/lib/release", dst="lib"): self.path("libapr-1.so.0") self.path("libaprutil-1.so.0") self.path("libbreakpad_client.so.0.0.0", "libbreakpad_client.so.0") @@ -947,10 +947,10 @@ class Linux_i686Manifest(LinuxManifest): self.end_prefix("lib") # Vivox runtimes - if self.prefix(src="vivox-runtime/i686-linux", dst="bin"): + if self.prefix(src="../packages/lib/release", dst="bin"): self.path("SLVoice") self.end_prefix() - if self.prefix(src="vivox-runtime/i686-linux", dst="lib"): + if self.prefix(src="../packages/lib/release", dst="lib"): self.path("libortp.so") self.path("libsndfile.so.1") #self.path("libvivoxoal.so.1") # no - we'll re-use the viewer's own OpenAL lib |