From 0db3fa4503224c44773a0b93d0bb8cf1c863950c Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Wed, 17 Jan 2018 15:21:46 -0500
Subject: [PATCH] use 64bit vivox sdk components in 64bit windows builds
---
indra/newview/CMakeLists.txt | 14 ++++++++++++--
indra/newview/viewer_manifest.py | 8 ++++++--
2 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index c5bba5def51..9424cbe3500 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1749,8 +1749,6 @@ if (WINDOWS)
${SHARED_LIB_STAGING_DIR}/RelWithDebInfo/libhunspell.dll
${SHARED_LIB_STAGING_DIR}/Debug/libhunspell.dll
${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}/SLVoice.exe
- ${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}/vivoxsdk.dll
- ${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}/ortp.dll
${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}/libsndfile-1.dll
${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}/vivoxoal.dll
${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}/ca-bundle.crt
@@ -1771,6 +1769,18 @@ if (WINDOWS)
windows-crash-logger
)
+ if (ADDRESS_SIZE EQUAL 64)
+ list(APPEND COPY_INPUT_DEPENDENCIES
+ ${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}/vivoxsdk_64.dll
+ ${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}/ortp_64.dll
+ )
+ else (ADDRESS_SIZE EQUAL 64)
+ list(APPEND COPY_INPUT_DEPENDENCIES
+ ${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}/vivoxsdk.dll
+ ${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}/ortp.dll
+ )
+ endif (ADDRESS_SIZE EQUAL 64)
+
if (FMODEX)
list(APPEND COPY_INPUT_DEPENDENCIES
${SHARED_LIB_STAGING_DIR}/Release/fmodex.dll
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 72a83968e99..9866d77c130 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -562,8 +562,12 @@ def construct(self):
# 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")
--
GitLab