diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2015-01-21 08:28:33 -0500 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2015-01-21 08:28:33 -0500 |
commit | 93fe221208399e47333fa9c696c60c3e0ad3eebb (patch) | |
tree | 1e7c843036f8bac7e4e4cb92f713515962128a5f /indra/cmake | |
parent | 707e51629ec2d540871cb625a7293c1fdebcebcf (diff) |
Backed out changeset 1e36e0629994 copying .dylibs on Linux
The .dylib files in the Linux Vivox package were erroneous to start with;
while the affected changeset bypassed copy errors, it too was wrong. Now that
the Linux Vivox package contains Linux .so files, revert to the correct
filenames to copy.
Diffstat (limited to 'indra/cmake')
-rwxr-xr-x | indra/cmake/Copy3rdPartyLibs.cmake | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index a1a9ff55f5..28202f85d6 100755 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -233,11 +233,11 @@ elseif(LINUX) set(vivox_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}") set(vivox_files - libsndfile.dylib - libortp.dylib - libvivoxoal.dylib - libvivoxplatform.dylib - libvivoxsdk.dylib + libsndfile.so.1 + libortp.so + libvivoxoal.so.1 + libvivoxplatform.so + libvivoxsdk.so SLVoice # ca-bundle.crt #No cert for linux. It is actually still 3.2SDK. ) |