From 4bf583aaa23700ec92df0fcf1b9d8978e29199f7 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Thu, 21 Jul 2016 17:14:07 -0400
Subject: SL-429: Use a new certificate authority bundle based on data from
 Mozilla

---
 indra/cmake/Copy3rdPartyLibs.cmake | 7 -------
 indra/cmake/LLCA.cmake             | 4 ++++
 2 files changed, 4 insertions(+), 7 deletions(-)
 create mode 100644 indra/cmake/LLCA.cmake

(limited to 'indra/cmake')

diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index 70d85b864c..9a28b85c00 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -20,11 +20,8 @@ if(WINDOWS)
     set(vivox_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
     set(vivox_files
         SLVoice.exe
-        ca-bundle.crt
-        libsndfile-1.dll
         vivoxsdk.dll
         ortp.dll
-        vivoxoal.dll
         )
 
     #*******************************
@@ -158,9 +155,6 @@ elseif(DARWIN)
     set(vivox_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
     set(vivox_files
         SLVoice
-        ca-bundle.crt
-        libsndfile.dylib
-        libvivoxoal.dylib
         libortp.dylib
         libvivoxplatform.dylib
         libvivoxsdk.dylib
@@ -202,7 +196,6 @@ elseif(LINUX)
         libvivoxplatform.so
         libvivoxsdk.so
         SLVoice
-        # ca-bundle.crt   #No cert for linux.  It is actually still 3.2SDK.
        )
     # *TODO - update this to use LIBS_PREBUILT_DIR and LL_ARCH_DIR variables
     # or ARCH_PREBUILT_DIRS
diff --git a/indra/cmake/LLCA.cmake b/indra/cmake/LLCA.cmake
new file mode 100644
index 0000000000..412a5a99a4
--- /dev/null
+++ b/indra/cmake/LLCA.cmake
@@ -0,0 +1,4 @@
+# -*- cmake -*-
+include(Prebuilt)
+
+use_prebuilt_binary(llca)
-- 
cgit v1.2.3


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: more places where vivox names must be conditional on address size

---
 indra/cmake/Copy3rdPartyLibs.cmake | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'indra/cmake')

diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index 77c588704c..dea36323f0 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 
-- 
cgit v1.2.3


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 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/cmake')

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
-- 
cgit v1.2.3