3 files changed, 36 insertions, 6 deletions

diff --git a/linden/indra/cmake/CopyWinLibs.cmake b/linden/indra/cmake/CopyWinLibs.cmake
index d4ddb23..92b5d71 100644
--- a/linden/indra/cmake/CopyWinLibs.cmake
+++ b/linden/indra/cmake/CopyWinLibs.cmake
@@ -8,12 +8,7 @@ include(CMakeCopyIfDifferent)
 
 set(vivox_src_dir "${CMAKE_SOURCE_DIR}/newview/vivox-runtime/i686-win32")
 set(vivox_files
-    tntk.dll
-    libeay32.dll
     SLVoice.exe
-    ssleay32.dll
-    SLVoiceAgent.exe
-    srtp.dll
     alut.dll
     vivoxsdk.dll
     ortp.dll
diff --git a/linden/indra/cmake/LLAudio.cmake b/linden/indra/cmake/LLAudio.cmake
index eff643d..ff479f6 100644
--- a/linden/indra/cmake/LLAudio.cmake
+++ b/linden/indra/cmake/LLAudio.cmake
@@ -6,4 +6,11 @@ set(LLAUDIO_INCLUDE_DIRS
     ${LIBS_OPEN_DIR}/llaudio
     )
 
-set(LLAUDIO_LIBRARIES llaudio)
+set(LLAUDIO_LIBRARIES
+    llaudio
+    ${VORBISENC_LIBRARIES}
+    ${VORBISFILE_LIBRARIES}
+    ${VORBIS_LIBRARIES}
+    ${OGG_LIBRARIES}
+    ${OPENAL_LIBRARIES}
+    )
diff --git a/linden/indra/cmake/OPENAL.cmake b/linden/indra/cmake/OPENAL.cmake
new file mode 100644
index 0000000..eb195a0
--- /dev/null
+++ b/linden/indra/cmake/OPENAL.cmake
@@ -0,0 +1,28 @@
+# -*- cmake -*-
+include(Linking)
+include(Prebuilt)
+
+if (LINUX)
+  set(OPENAL ON CACHE BOOL "Enable OpenAL")
+else (LINUX)
+  set(OPENAL OFF CACHE BOOL "Enable OpenAL")
+endif (LINUX)
+
+if (OPENAL)
+  if (STANDALONE)
+    include(FindPkgConfig)
+    include(FindOpenAL)
+    pkg_check_modules(OPENAL_LIB REQUIRED openal)
+    pkg_check_modules(FREEALUT_LIB REQUIRED freealut)
+  else (STANDALONE)
+    use_prebuilt_binary(openal)
+  endif (STANDALONE)
+  set(OPENAL_LIBRARIES 
+    openal
+    alut
+    )
+endif (OPENAL)
+
+if (OPENAL)
+  message(STATUS "Building with OpenAL audio support")
+endif (OPENAL)