Skip to content
Snippets Groups Projects
Commit 19293991 authored by jenn's avatar jenn
Browse files

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.
parent f38c18bb
No related branches found
No related tags found
No related merge requests found
...@@ -1330,7 +1330,7 @@ ...@@ -1330,7 +1330,7 @@
<key>slvoice</key> <key>slvoice</key>
<map> <map>
<key>license_file</key> <key>license_file</key>
<string>LICENSES/apr_suite.txt</string> <string>LICENSES/slvoice.txt</string>
<key>name</key> <key>name</key>
<string>vivox</string> <string>vivox</string>
<key>platforms</key> <key>platforms</key>
...@@ -1347,6 +1347,18 @@ ...@@ -1347,6 +1347,18 @@
<key>name</key> <key>name</key>
<string>darwin</string> <string>darwin</string>
</map> </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> <key>windows</key>
<map> <map>
<key>archive</key> <key>archive</key>
......
...@@ -155,9 +155,9 @@ elseif(DARWIN) ...@@ -155,9 +155,9 @@ elseif(DARWIN)
elseif(LINUX) elseif(LINUX)
# linux is weird, multiple side by side configurations aren't supported # 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... # 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_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_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
set(vivox_files set(vivox_files
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment