diff options
| author | Oz Linden <oz@lindenlab.com> | 2018-01-17 15:21:46 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2018-01-17 15:21:46 -0500 |
| commit | 0db3fa4503224c44773a0b93d0bb8cf1c863950c (patch) | |
| tree | ea25ab88747f2e51dcaad0556093eac3e869d049 /indra/newview/viewer_manifest.py | |
| parent | 520b2418dc59e435b9005bc39506460cb13649d2 (diff) | |
use 64bit vivox sdk components in 64bit windows builds
Diffstat (limited to 'indra/newview/viewer_manifest.py')
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 72a83968e9..9866d77c13 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -562,8 +562,12 @@ class WindowsManifest(ViewerManifest): # Vivox runtimes self.path("SLVoice.exe") - self.path("vivoxsdk.dll") - self.path("ortp.dll") + if (self.address_size == 64): + self.path("vivoxsdk_64.dll") + self.path("ortp_64.dll") + else: + self.path("vivoxsdk.dll") + self.path("ortp.dll") self.path("libsndfile-1.dll") self.path("vivoxoal.dll") |