diff options
| author | jenn <jenn@lindenlab.com> | 2011-01-18 16:27:18 -0800 |
|---|---|---|
| committer | jenn <jenn@lindenlab.com> | 2011-01-18 16:27:18 -0800 |
| commit | 19293991b708b90bbe75c86f7a6b0861d741b57a (patch) | |
| tree | 2613a46dcbacf87aaf29110bb7d2da4d659a01ec | |
| parent | f38c18bb3d92bf6d1b918e30e21616fa7a9bb578 (diff) | |
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.
| -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 |