From 4181b1d9e20f54f307746b7913f5412a15b13a1b Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Thu, 18 Jan 2018 12:49:54 -0500
Subject: correct 64bit vivox dll names

---
 indra/cmake/Copy3rdPartyLibs.cmake | 4 ++--
 indra/newview/CMakeLists.txt       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'indra')

diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index dea36323f0..09a97fc03e 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -23,8 +23,8 @@ if(WINDOWS)
         )
     if (ADDRESS_SIZE EQUAL 64)
         list(APPEND vivox_files
-            vivoxsdk_64.dll
-            ortp_64.dll
+            vivoxsdk_x64.dll
+            ortp_x64.dll
             )
     else (ADDRESS_SIZE EQUAL 64)
         list(APPEND vivox_files
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 9424cbe350..6b16713add 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1771,8 +1771,8 @@ if (WINDOWS)
 
     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
+            ${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}/vivoxsdk_x64.dll
+            ${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}/ortp_x64.dll
             )
     else (ADDRESS_SIZE EQUAL 64)
         list(APPEND COPY_INPUT_DEPENDENCIES
-- 
cgit v1.2.3