livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert Vivox for win32 from 3.2 to 2.1, FIRE-1154

master
Arrehn 2011-06-13 23:47:57 -04:00
parent 62bb86beee
commit bd61ec06b2
4 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/cmake/Copy3rdPartyLibs.cmake
View File

@ -19,12 +19,10 @@ if(WINDOWS)
set(vivox_src_dir "${CMAKE_SOURCE_DIR}/newview/vivox-runtime/i686-win32")
set(vivox_files
SLVoice.exe
libsndfile-1.dll
vivoxplatform.dll
vivoxsdk.dll
ortp.dll
zlib1.dll
vivoxoal.dll
alut.dll
wrap_oal.dll
)
#*******************************

2
indra/newview/CMakeLists.txt
View File

@ -1576,6 +1576,8 @@ if (WINDOWS)
${SHARED_LIB_STAGING_DIR}/Debug/msvcp80d.dll
${SHARED_LIB_STAGING_DIR}/Debug/Microsoft.VC80.DebugCRT.manifest
${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}/SLVoice.exe
${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}/alut.dll
${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}/wrap_oal.dll
${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}/vivoxsdk.dll
${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}/ortp.dll
${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}/libsndfile-1.dll

6
indra/newview/viewer_manifest.py
View File

@ -325,10 +325,8 @@ class WindowsManifest(ViewerManifest):
self.path("SLVoice.exe")
self.path("vivoxsdk.dll")
self.path("ortp.dll")
self.path("libsndfile-1.dll")
self.path("zlib1.dll")
self.path("vivoxplatform.dll")
self.path("vivoxoal.dll")
self.path("alut.dll")
self.path("wrap_oal.dll")
# For google-perftools tcmalloc allocator.
try:

2
install.xml
View File

@ -1435,7 +1435,7 @@ anguage Infrstructure (CLI) international standard</string>
<key>md5sum</key>
<string>940ac55a6d0141c958bf2b14939d8474</string>
<key>url</key>
<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/slvoice-3.2.0002.9361-windows-20101117a.tar.bz2</uri>
<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-2.1.3010.6270-windows-20090309.tar.bz2</uri>
</map>
</map>
</map>