diff options
| author | Mark Palange (Mani) <palange@lindenlab.com> | 2009-10-02 10:35:42 -0700 |
|---|---|---|
| committer | Mark Palange (Mani) <palange@lindenlab.com> | 2009-10-02 10:35:42 -0700 |
| commit | 4d53e235c2445b820bb0ae7303b269648dd86037 (patch) | |
| tree | c1ab3643cf257099822e7a0e1e832d76813555f6 /indra/newview/viewer_manifest.py | |
| parent | 80f27013b2d2a7ca6509db033c8f0c31562e04c7 (diff) | |
| parent | dde2153014cd7d7b8fa704f7067a41344bfbb1c2 (diff) | |
merge of latest viewer/viewer-20
Diffstat (limited to 'indra/newview/viewer_manifest.py')
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index bda81a505d..e98ef4749b 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -270,7 +270,6 @@ class WindowsManifest(ViewerManifest): self.path("fmod.dll") self.enable_no_crt_manifest_check() - # Media plugins - QuickTime if self.prefix(src='../media_plugins/quicktime/%s' % self.args['configuration'], dst="llplugin"): self.path("media_plugin_quicktime.dll") @@ -319,10 +318,12 @@ class WindowsManifest(ViewerManifest): # Vivox runtimes if self.prefix(src=self.args['configuration'], dst=""): self.path("SLVoice.exe") - self.path("alut.dll") + self.path("libsndfile-1.dll") + self.path("zlib1.dll") self.path("vivoxsdk.dll") + self.path("vivoxplatform.dll") self.path("ortp.dll") - self.path("wrap_oal.dll") + self.path("vivoxoal.dll") self.end_prefix() # pull in the crash logger and updater from other projects @@ -536,10 +537,11 @@ class DarwinManifest(ViewerManifest): self.path("zh-Hans.lproj") # SLVoice and vivox lols - self.path("vivox-runtime/universal-darwin/libalut.dylib", "libalut.dylib") - self.path("vivox-runtime/universal-darwin/libopenal.dylib", "libopenal.dylib") + self.path("vivox-runtime/universal-darwin/libsndfile.dylib", "libsndfile.dylib") + self.path("vivox-runtime/universal-darwin/libvivoxoal.dylib", "libvivoxoal.dylib") self.path("vivox-runtime/universal-darwin/libortp.dylib", "libortp.dylib") self.path("vivox-runtime/universal-darwin/libvivoxsdk.dylib", "libvivoxsdk.dylib") + self.path("vivox-runtime/universal-darwin/libvivoxplatform.dylib", "libvivoxplatform.dylib") self.path("vivox-runtime/universal-darwin/SLVoice", "SLVoice") libdir = "../../libraries/universal-darwin/lib_release" @@ -809,7 +811,10 @@ class Linux_i686Manifest(LinuxManifest): self.end_prefix() if self.prefix(src="vivox-runtime/i686-linux", dst="lib"): self.path("libortp.so") + self.path("libsndfile.so.1") + self.path("libvivoxoal.so.1") self.path("libvivoxsdk.so") + self.path("libvivoxplatform.so") self.end_prefix("lib") class Linux_x86_64Manifest(LinuxManifest): |