1 files changed, 15 insertions, 11 deletions
diff --git a/indra/cmake/OPENAL.cmake b/indra/cmake/OPENAL.cmake
index d01c680ed1..1bbfff6f98 100644..100755
--- a/indra/cmake/OPENAL.cmake
+++ b/indra/cmake/OPENAL.cmake
@@ -9,20 +9,24 @@ else (LINUX)
 endif (LINUX)
 
 if (OPENAL)
-  if (STANDALONE)
+  set(OPENAL_LIB_INCLUDE_DIRS "${LIBS_PREBUILT_DIR}/include/AL")
+  if (USESYSTEMLIBS)
     include(FindPkgConfig)
     include(FindOpenAL)
     pkg_check_modules(OPENAL_LIB REQUIRED openal)
     pkg_check_modules(FREEALUT_LIB REQUIRED freealut)
-  else (STANDALONE)
-    use_prebuilt_binary(openal-soft)
-  endif (STANDALONE)
-  set(OPENAL_LIBRARIES 
-    openal
-    alut
+  else (USESYSTEMLIBS)
+    use_prebuilt_binary(openal)
+  endif (USESYSTEMLIBS)
+  if(WINDOWS)
+    set(OPENAL_LIBRARIES 
+      OpenAL32
+      alut
     )
-endif (OPENAL)
-
-if (OPENAL)
-  message(STATUS "Building with OpenAL audio support")
+  else()
+    set(OPENAL_LIBRARIES 
+      openal
+      alut
+    )
+  endif()
 endif (OPENAL)