summaryrefslogtreecommitdiff
path: root/indra/cmake
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-08-05 15:10:39 -0400
committerOz Linden <oz@lindenlab.com>2013-08-05 15:10:39 -0400
commit91a91d1b23394bb0e3b0fb4af21703e3d6e9437a (patch)
tree6eda4baca46b5df037bb2ffd4af76f5fa4b2e29f /indra/cmake
parentb75213b39ad7456d04d3e1644f2116853ead0da0 (diff)
parent32b8d398eca5eaa4ca99aa48839ad64d97954cae (diff)
merge changes for 3.6.2-release
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