Cross-platform checking for OpenAL libs.

2 files changed, 78 insertions, 6 deletions

diff --git a/linden/indra/cmake/LLAudio.cmake b/linden/indra/cmake/LLAudio.cmake
index 893aa68..dcfd269 100644
--- a/linden/indra/cmake/LLAudio.cmake
+++ b/linden/indra/cmake/LLAudio.cmake
@@ -5,6 +5,7 @@ include(OPENAL)
 
 set(LLAUDIO_INCLUDE_DIRS
     ${LIBS_OPEN_DIR}/llaudio
+    ${OPENAL_INCLUDE_DIRS}
     )
 
 set(LLAUDIO_LIBRARIES
diff --git a/linden/indra/cmake/OPENAL.cmake b/linden/indra/cmake/OPENAL.cmake
index 1849fbf..277e3f9 100644
--- a/linden/indra/cmake/OPENAL.cmake
+++ b/linden/indra/cmake/OPENAL.cmake
@@ -2,13 +2,84 @@
 
 set(OPENAL ON CACHE BOOL "Enable OpenAL")
 
+
 if (OPENAL)
-  include(FindPkgConfig)
-  pkg_check_modules(OPENAL_LIB REQUIRED openal)
-  pkg_check_modules(FREEAULT_LIB REQUIRED freealut)
-  set(OPENAL_LIBRARIES 
-    openal
-    alut
+
+  # message(STATUS "Building with OpenAL audio support")
+
+  # OPENAL_LIB
+
+  find_library(OPENAL_LIB
+    NAMES openal OpenAL OpenAL32 wrap_oal
+    PATHS ${ARCH_PREBUILT_DIRS_RELEASE}
+    )
+
+  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
+
+  find_path(OPENAL_INCLUDE_DIR
+    NAMES al.h
+    PATHS ${LIBS_PREBUILT_DIR}/include
+    )
+
+  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
+
+  find_library(ALUT_LIB
+    NAMES alut freealut
+    PATHS ${ARCH_PREBUILT_DIRS_RELEASE}
+    )
+
+  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
+    )
+
+  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)