diff options
| author | jenn <jenn@lindenlab.com> | 2011-01-18 16:27:35 -0800 |
|---|---|---|
| committer | jenn <jenn@lindenlab.com> | 2011-01-18 16:27:35 -0800 |
| commit | 90202a32f8caf7a7e621d69f4315c26f26ff522c (patch) | |
| tree | 3796ec68dc329872c16aca43aed6684d138377e0 | |
| parent | 8bc12ce82fa4d7ce8584a6dbc095a0cfe3ae88e3 (diff) | |
| parent | 19293991b708b90bbe75c86f7a6b0861d741b57a (diff) | |
Automated merge with https://bitbucket.org/mani_linden/viewer-autobuild
| -rw-r--r-- | autobuild.xml | 14 | ||||
| -rw-r--r-- | indra/cmake/Copy3rdPartyLibs.cmake | 4 |
2 files changed, 15 insertions, 3 deletions
diff --git a/autobuild.xml b/autobuild.xml index 30b1c1cace..f2a8bc10bf 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 2e8bb04db1..9741d4f890 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 |