From 0db3fa4503224c44773a0b93d0bb8cf1c863950c Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Wed, 17 Jan 2018 15:21:46 -0500 Subject: use 64bit vivox sdk components in 64bit windows builds --- indra/newview/viewer_manifest.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'indra/newview/viewer_manifest.py') 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") -- cgit v1.2.3