1 files changed, 20 insertions, 4 deletions

diff --git a/linden/indra/cmake/OPENAL.cmake b/linden/indra/cmake/OPENAL.cmake
index a2bae5d..5e71f66 100644
--- a/linden/indra/cmake/OPENAL.cmake
+++ b/linden/indra/cmake/OPENAL.cmake
@@ -9,11 +9,19 @@ if (OPENAL)
 
   # OPENAL_LIB
 
+  if (WINDOWS)
   find_library(OPENAL_LIB
-    NAMES openal OpenAL OpenAL32 wrap_oal
-    PATHS ${ARCH_PREBUILT_DIRS_RELEASE}
+    NAMES openal openal32 OpenAL OpenAL32 wrap_oal
+    PATHS ${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release
     )
 
+  else (WINDOWS)
+  find_library(OPENAL_LIB
+    NAMES openal openal32 OpenAL OpenAL32 wrap_oal
+    PATHS ${ARCH_PREBUILT_DIRS_RELEASE}
+    )
+  endif (WINDOWS)
+  
   if (NOT OPENAL_LIB)
     message(FATAL_ERROR "OpenAL not found!")
   else (NOT OPENAL_LIB)
@@ -26,7 +34,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)
@@ -39,10 +47,18 @@ if (OPENAL)
 
   # ALUT_LIB
 
+  if (WINDOWS)
+   find_library(ALUT_LIB
+   NAMES alut freealut
+   PATHS ${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release
+   )
+  
+  else (WINDOWS) 
   find_library(ALUT_LIB
     NAMES alut freealut
     PATHS ${ARCH_PREBUILT_DIRS_RELEASE}
     )
+  endif (WINDOWS)
 
   if (NOT ALUT_LIB)
     message(FATAL_ERROR "ALUT not found!")
@@ -56,7 +72,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)