summaryrefslogtreecommitdiff
path: root/indra/cmake
diff options
context:
space:
mode:
Diffstat (limited to 'indra/cmake')
-rw-r--r--indra/cmake/Copy3rdPartyLibs.cmake5
-rw-r--r--indra/cmake/LLCA.cmake4
2 files changed, 4 insertions, 5 deletions
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index ce9f005e9f..77c588704c 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -20,10 +20,8 @@ if(WINDOWS)
set(vivox_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
set(vivox_files
SLVoice.exe
- libsndfile-1.dll
vivoxsdk.dll
ortp.dll
- vivoxoal.dll
)
#*******************************
@@ -151,8 +149,6 @@ elseif(DARWIN)
set(vivox_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
set(vivox_files
SLVoice
- libsndfile.dylib
- libvivoxoal.dylib
libortp.dylib
libvivoxplatform.dylib
libvivoxsdk.dylib
@@ -195,7 +191,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)