1 files changed, 105 insertions, 20 deletions

diff --git a/linden/indra/cmake/OPENAL.cmake b/linden/indra/cmake/OPENAL.cmake
index eb195a0..94fa75d 100644
--- a/linden/indra/cmake/OPENAL.cmake
+++ b/linden/indra/cmake/OPENAL.cmake
@@ -1,28 +1,113 @@
 # -*- cmake -*-
+
+include(Variables)
 include(Linking)
-include(Prebuilt)
 
-if (LINUX)
-  set(OPENAL ON CACHE BOOL "Enable OpenAL")
-else (LINUX)
-  set(OPENAL OFF CACHE BOOL "Enable OpenAL")
-endif (LINUX)
+set(OPENAL ON CACHE BOOL "Enable OpenAL")
+
 
 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
+
+  # message(STATUS "Building with OpenAL audio support")
+
+  # OPENAL_LIB
+
+  if (WINDOWS)
+    find_library(OPENAL_LIB
+      NAMES openal32
+      PATHS ${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release
+      )
+  elseif (DARWIN)
+    # Look for for system's OpenAL.framework
+    find_library(OPENAL_LIB
+      NAMES openal.1
+      PATHS ${ARCH_PREBUILT_DIRS_RELEASE}
+      NO_DEFAULT_PATH
+      )
+  else (WINDOWS)
+    set(OPENAL_LIB openal)
+  endif (WINDOWS)
+  
+  if (NOT OPENAL_LIB)
+    message(FATAL_ERROR "OpenAL not found!")
+  else (NOT OPENAL_LIB)
+    # message(STATUS "OpenAL found: ${OPENAL_LIB}")
+  endif (NOT OPENAL_LIB)
+
+
+
+  # OPENAL_INCLUDE_DIR
+
+  if (DARWIN)
+    set(OPENAL_INCLUDE_DIR "${LIBS_PREBUILT_DIR}/include/AL")        
+  else (DARWIN)
+    find_path(OPENAL_INCLUDE_DIR
+      NAMES al.h
+      PATHS ${LIBS_PREBUILT_DIR}/include/AL
+      )
+  endif (DARWIN)
+
+  if (NOT OPENAL_INCLUDE_DIR)
+    message(FATAL_ERROR "al.h not found!")
+  else (NOT OPENAL_INCLUDE_DIR)
+    # message(STATUS "al.h found in: ${OPENAL_INCLUDE_DIR}")
+  endif (NOT OPENAL_INCLUDE_DIR)
+
+
+
+  # ALUT_LIB
+
+  if (WINDOWS)
+   find_library(ALUT_LIB
+     NAMES alut freealut
+     PATHS ${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release
+     )
+  elseif (DARWIN)
+    find_library( ALUT_LIB
+      NAMES alut.0
+      PATHS ${ARCH_PREBUILT_DIRS_RELEASE}
+      NO_DEFAULT_PATH
+      )
+  else (WINDOWS)
+    set(ALUT_LIB alut)
+  endif (WINDOWS)
+
+  if (NOT ALUT_LIB)
+    message(FATAL_ERROR "ALUT not found!")
+  else (NOT ALUT_LIB)
+    # message(STATUS "ALUT found: ${ALUT_LIB}")
+  endif (NOT ALUT_LIB)
+
+
+
+  # ALUT_INCLUDE_DIR
+
+  find_path(ALUT_INCLUDE_DIR
+    NAMES alut.h
+    PATHS ${LIBS_PREBUILT_DIR}/include/AL
+    )
+
+  if (NOT ALUT_INCLUDE_DIR)
+    message(FATAL_ERROR "alut.h not found!")
+  else (NOT ALUT_INCLUDE_DIR)
+    # message(STATUS "alut.h found in: ${ALUT_INCLUDE_DIR}")
+  endif (NOT ALUT_INCLUDE_DIR)
+
+
+
+  set(OPENAL_LIBRARIES
+    ${OPENAL_LIB}
+    ${ALUT_LIB}
+    )
+
+  set(OPENAL_INCLUDE_DIRS
+    ${OPENAL_INCLUDE_DIR}
+    ${ALUT_INCLUDE_DIR}
+    )
+  
+
+  set(OPENAL_FOUND TRUE CACHE BOOL
+    "Found OpenAL and ALUT libraries successfully"
     )
-endif (OPENAL)
 
-if (OPENAL)
-  message(STATUS "Building with OpenAL audio support")
 endif (OPENAL)