From 93fe221208399e47333fa9c696c60c3e0ad3eebb Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Wed, 21 Jan 2015 08:28:33 -0500 Subject: 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. --- indra/cmake/Copy3rdPartyLibs.cmake | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'indra/cmake') 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. ) -- cgit v1.2.3