From 19293991b708b90bbe75c86f7a6b0861d741b57a Mon Sep 17 00:00:00 2001
From: jenn <jenn@lindenlab.com>
Date: Tue, 18 Jan 2011 16:27:18 -0800
Subject: [PATCH] Added 'slvoice' (vivox) to autobuild.xml for linux. This is
version 3.1 of the lib; viewer was using version 3.2, but this version has
been rebuilt using the new package layout. Hopefully it will work, though we
may need to convert version 3.2 if it does not.
Updated Copy3rdParyLibs.cmake paths for linux installation of vivox files.
---
autobuild.xml | 14 +++++++++++++-
indra/cmake/Copy3rdPartyLibs.cmake | 4 ++--
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/autobuild.xml b/autobuild.xml
index 30b1c1cace4..f2a8bc10bf4 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1330,7 +1330,7 @@
<key>slvoice</key>
<map>
<key>license_file</key>
- <string>LICENSES/apr_suite.txt</string>
+ <string>LICENSES/slvoice.txt</string>
<key>name</key>
<string>vivox</string>
<key>platforms</key>
@@ -1347,6 +1347,18 @@
<key>name</key>
<string>darwin</string>
</map>
+ <key>linux</key>
+ <map>
+ <key>archive</key>
+ <map>
+ <key>hash</key>
+ <string>827ebbcddb31516e7e40a37374a52ebf</string>
+ <key>url</key>
+ <string>http://viewer-source-downloads.s3.amazonaws.com/install_pkgs/vivox-3.1.0001.8821-linux-20101018.tar.bz2</string>
+ </map>
+ <key>name</key>
+ <string>linux</string>
+ </map>
<key>windows</key>
<map>
<key>archive</key>
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index 2e8bb04db12..9741d4f890b 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -155,9 +155,9 @@ elseif(DARWIN)
elseif(LINUX)
# linux is weird, multiple side by side configurations aren't supported
# and we don't seem to have any debug shared libs built yet anyways...
- set(SHARED_LIB_STAGING_DIR_DEBUG "${SHARED_LIB_STAGING_DIR}")
+ set(SHARED_LIB_STAGING_DIR_DEBUG "${SHARED_LIB_STAGING_DIR}/debug")
set(SHARED_LIB_STAGING_DIR_RELWITHDEBINFO "${SHARED_LIB_STAGING_DIR}")
- set(SHARED_LIB_STAGING_DIR_RELEASE "${SHARED_LIB_STAGING_DIR}")
+ set(SHARED_LIB_STAGING_DIR_RELEASE "${SHARED_LIB_STAGING_DIR}/release")
set(vivox_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
set(vivox_files
--
GitLab