summaryrefslogtreecommitdiff
path: root/indra/cmake
diff options
context:
space:
mode:
authorGilbert Gonzales <gilbert@lindenlab.com>2013-08-06 10:27:42 -0700
committerGilbert Gonzales <gilbert@lindenlab.com>2013-08-06 10:27:42 -0700
commitb269fcb7c8b4988cdb9d18164011320d12389355 (patch)
treedfb5de8684be04537682e4ef6cdece3719490be3 /indra/cmake
parentc7342bc6c0950add28918159935b8001c4ad2dc8 (diff)
parent74e3fb7b33fe584c887b4193f290e069e9ddffcd (diff)
merge
Diffstat (limited to 'indra/cmake')
-rwxr-xr-xindra/cmake/Copy3rdPartyLibs.cmake3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index 29ab4b1710..1b211ca7b9 100755
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -20,6 +20,7 @@ if(WINDOWS)
set(vivox_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
set(vivox_files
SLVoice.exe
+ ca-bundle.crt
libsndfile-1.dll
vivoxplatform.dll
vivoxsdk.dll
@@ -195,6 +196,7 @@ elseif(DARWIN)
set(vivox_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
set(vivox_files
SLVoice
+ ca-bundle.crt
libsndfile.dylib
libvivoxoal.dylib
libortp.dylib
@@ -241,6 +243,7 @@ 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