diff options
| author | dolphin <dolphin@lindenlab.com> | 2013-08-08 09:26:36 -0700 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2013-08-08 09:26:36 -0700 |
| commit | e0cc3cbd977dcfbe4ef8409b8484a30b2c63dcc1 (patch) | |
| tree | d96e036d18bae1ddd3704b4abd55fe6565844d80 /indra/cmake | |
| parent | 6354ad379d0850b4cc3969130fb1b30b0e2c0ee9 (diff) | |
| parent | 32b8d398eca5eaa4ca99aa48839ad64d97954cae (diff) | |
Merge with 3.6.2-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 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 |