diff options
| author | simon <none@none> | 2013-08-05 14:50:40 -0700 |
|---|---|---|
| committer | simon <none@none> | 2013-08-05 14:50:40 -0700 |
| commit | 71e2efab169af5d56f8c5416874d2f7c491f01f1 (patch) | |
| tree | 374b1aa2f3dcdcaed452b64307da235cafb76756 /indra/cmake | |
| parent | ee25146ce4cac282d70b8cc32d58613e31f197f9 (diff) | |
| parent | b50f54db591dfe6cb5304b6b29d50c2066c69747 (diff) | |
Merge downstream code - Vivox release
Diffstat (limited to 'indra/cmake')
| -rwxr-xr-x | indra/cmake/Copy3rdPartyLibs.cmake | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 695dc2840d..44c2d3ac27 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 |