Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Voice Update] Update SLVoice prebuilds and packaging script

Browse Source
This commit is contained in:
Latif Khalifa
2014-03-12 22:50:43 +01:00
parent f1b8c36a28
commit bb9a958a1e
3 changed files with 35 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
indra/cmake/CopyWinLibs.cmake
View File

@@ -16,11 +16,14 @@ endif(WORD_SIZE EQUAL 32)
set(vivox_src_dir "${CMAKE_SOURCE_DIR}/newview/vivox-runtime/i686-win32")
set(vivox_files
SLVoice.exe
alut.dll
vivoxsdk.dll
ca-bundle.crt
libsndfile-1.dll
ortp.dll
wrap_oal.dll
SLVoice.exe
vivoxoal.dll
vivoxplatform.dll
vivoxsdk.dll
zlib1.dll
)
copy_if_different(
${vivox_src_dir}

25
indra/newview/viewer_manifest.py
View File

@@ -316,10 +316,13 @@ class WindowsManifest(ViewerManifest):
# Vivox runtimes
if self.prefix(src="vivox-runtime/i686-win32", dst=""):
self.path("SLVoice.exe")
self.path("alut.dll")
self.path("vivoxsdk.dll")
self.path("ca-bundle.crt")
self.path("libsndfile-1.dll")
self.path("ortp.dll")
self.path("wrap_oal.dll")
self.path("vivoxoal.dll")
self.path("vivoxplatform.dll")
self.path("vivoxsdk.dll")
self.path("zlib1.dll")
self.end_prefix()
if 'extra_libraries' in self.args:
@@ -512,11 +515,13 @@ class DarwinManifest(ViewerManifest):
self.path("zh-Hans.lproj")
# SLVoice and vivox lols
self.path("vivox-runtime/universal-darwin/libalut.dylib", "libalut.dylib")
self.path("vivox-runtime/universal-darwin/libopenal.dylib", "libopenal.dylib")
self.path("vivox-runtime/universal-darwin/libortp.dylib", "libortp.dylib")
self.path("vivox-runtime/universal-darwin/libvivoxsdk.dylib", "libvivoxsdk.dylib")
self.path("vivox-runtime/universal-darwin/SLVoice", "SLVoice")
self.path("vivox-runtime/universal-darwin/ca-bundle.crt", "ca-bundle.crt")
self.path("vivox-runtime/universal-darwin/libortp.dylib", "libortp.dylib")
self.path("vivox-runtime/universal-darwin/libsndfile.dylib", "libsndfile.dylib")
self.path("vivox-runtime/universal-darwin/libvivoxoal.dylib", "libvivoxoal.dylib")
self.path("vivox-runtime/universal-darwin/libvivoxplatform.dylib", "libvivoxplatform.dylib")
self.path("vivox-runtime/universal-darwin/libvivoxsdk.dylib", "libvivoxsdk.dylib")
self.path("../llcommon/" + self.args['configuration'] + "/libllcommon.dylib", "libllcommon.dylib")
@@ -851,6 +856,9 @@ class Linux_i686Manifest(LinuxManifest):
self.end_prefix()
if self.prefix(src="vivox-runtime/i686-linux", dst="lib"):
self.path("libortp.so")
self.path("libsndfile.so.1")
self.path("libvivoxoal.so.1")
self.path("libvivoxplatform.so")
self.path("libvivoxsdk.so")
self.end_prefix("lib")
@@ -909,6 +917,9 @@ class Linux_x86_64Manifest(LinuxManifest):
if self.prefix(src="vivox-runtime/i686-linux", dst="lib32"):
#self.path("libalut.so")
self.path("libortp.so")
self.path("libsndfile.so.1")
self.path("libvivoxoal.so.1")
self.path("libvivoxplatform.so")
self.path("libvivoxsdk.so")
self.end_prefix("lib32")

20
install.xml
View File

@@ -1353,37 +1353,37 @@
<key>darwin</key>
<map>
<key>md5sum</key>
<string>8675b5eedef038b514338b17f0e55961</string>
<string>917a60e1b18dd0f5e6afb555623339a4</string>
<key>url</key>
<uri>https://bitbucket.org/SingularityViewer/libraries/downloads/vivox-2.1.3010.6270-darwin-20090309.tar.bz2</uri>
<uri>https://bitbucket.org/SingularityViewer/libraries/downloads/slvoice-4.6.0009.20030-darwin-20140312.tar.bz2</uri>
</map>
<key>linux</key>
<map>
<key>md5sum</key>
<string>01573510dce7f380f44e561ef2f3dd9f</string>
<string>2d7bf76438a6a13f1b3ee682af446f93</string>
<key>url</key>
<uri>https://bitbucket.org/SingularityViewer/libraries/downloads/vivox-2.1.3010.6270-linux-20090309.tar.bz2</uri>
<uri>https://bitbucket.org/SingularityViewer/libraries/downloads/slvoice-4.5.0009.17865-linux-20140312.tar.bz2</uri>
</map>
<key>linux64</key>
<map>
<key>md5sum</key>
<string>01573510dce7f380f44e561ef2f3dd9f</string>
<string>2d7bf76438a6a13f1b3ee682af446f93</string>
<key>url</key>
<uri>https://bitbucket.org/SingularityViewer/libraries/downloads/vivox-2.1.3010.6270-linux-20090309.tar.bz2</uri>
<uri>https://bitbucket.org/SingularityViewer/libraries/downloads/slvoice-4.5.0009.17865-linux-20140312.tar.bz2</uri>
</map>
<key>windows</key>
<map>
<key>md5sum</key>
<string>752daa90e07c05202d1f76980cb955eb</string>
<string>d0befc33613c980a5a3580b8e2b02d11</string>
<key>url</key>
<uri>https://bitbucket.org/SingularityViewer/libraries/downloads/vivox-2.1.3010.6270-windows-20090309.tar.bz2</uri>
<uri>https://bitbucket.org/SingularityViewer/libraries/downloads/slvoice-4.6.0009.20030-windows-20140312.tar.bz2</uri>
</map>
<key>windows64</key>
<map>
<key>md5sum</key>
<string>752daa90e07c05202d1f76980cb955eb</string>
<string>d0befc33613c980a5a3580b8e2b02d11</string>
<key>url</key>
<uri>https://bitbucket.org/SingularityViewer/libraries/downloads/vivox-2.1.3010.6270-windows-20090309.tar.bz2</uri>
<uri>https://bitbucket.org/SingularityViewer/libraries/downloads/slvoice-4.6.0009.20030-windows-20140312.tar.bz2</uri>
</map>
</map>
</map>