From 96d28ad5a797286208b664b3b2ca95046e71263b Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Thu, 18 Jan 2018 10:15:15 -0500
Subject: [PATCH] more places where vivox names must be conditional on address
size
---
indra/cmake/Copy3rdPartyLibs.cmake | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index 77c588704ca..dea36323f0f 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -20,9 +20,18 @@ if(WINDOWS)
set(vivox_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
set(vivox_files
SLVoice.exe
- vivoxsdk.dll
- ortp.dll
)
+ if (ADDRESS_SIZE EQUAL 64)
+ list(APPEND vivox_files
+ vivoxsdk_64.dll
+ ortp_64.dll
+ )
+ else (ADDRESS_SIZE EQUAL 64)
+ list(APPEND vivox_files
+ vivoxsdk.dll
+ ortp.dll
+ )
+ endif (ADDRESS_SIZE EQUAL 64)
#*******************************
# Misc shared libs
--
GitLab