Merge branch 'master' into osx_xcode5

2014-04-16 09:56:57 +02:00
parent 8183deeb30 5dca06d3d4
commit db678238ef
419 changed files with 20604 additions and 7014 deletions
--- a/indra/cmake/CopyWinLibs.cmake
+++ b/indra/cmake/CopyWinLibs.cmake
@@ -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}