1 files changed, 10 insertions, 3 deletions

diff --git a/linden/indra/cmake/OPENAL.cmake b/linden/indra/cmake/OPENAL.cmake
index a2bae5d..f24ec22 100644
--- a/linden/indra/cmake/OPENAL.cmake
+++ b/linden/indra/cmake/OPENAL.cmake
@@ -9,8 +9,15 @@ if (OPENAL)
 
   # OPENAL_LIB
 
+  if (WINDOWS)
   find_library(OPENAL_LIB
-    NAMES openal OpenAL OpenAL32 wrap_oal
+    NAMES openal openal32 OpenAL OpenAL32 wrap_oal
+    PATHS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/libraries/i686-win32/lib/release/
+    )
+
+  else (WINDOWS)
+  find_library(OPENAL_LIB
+    NAMES openal openal32 OpenAL OpenAL32 wrap_oal
     PATHS ${ARCH_PREBUILT_DIRS_RELEASE}
     )
 
@@ -26,7 +33,7 @@ if (OPENAL)
 
   find_path(OPENAL_INCLUDE_DIR
     NAMES al.h
-    PATHS ${LIBS_PREBUILT_DIR}/include /usr/include/AL
+    PATHS ${LIBS_PREBUILT_DIR}/include/AL /usr/include/AL
     )
 
   if (NOT OPENAL_INCLUDE_DIR)
@@ -56,7 +63,7 @@ if (OPENAL)
 
   find_path(ALUT_INCLUDE_DIR
     NAMES alut.h
-    PATHS ${LIBS_PREBUILT_DIR}/include /usr/include/AL
+    PATHS ${LIBS_PREBUILT_DIR}/include/AL /usr/include/AL
     )
 
   if (NOT ALUT_INCLUDE_DIR)