diff options
author | Don Kjer <don@lindenlab.com> | 2011-04-01 23:37:30 +0000 |
---|---|---|
committer | Don Kjer <don@lindenlab.com> | 2011-04-01 23:37:30 +0000 |
commit | d292053c04e6adfd48be0484dd5a8a07b48e0541 (patch) | |
tree | bb8814069df178e2bcae041f2c3e9b11338492db /indra/cmake/OPENAL.cmake | |
parent | f2bb81d17660054697ed984afc0e3f8d90f77eda (diff) | |
parent | 1664c9dc678f7aca9c2bbf38d28e00550e03c4dd (diff) |
Merge with viewer-development
Diffstat (limited to 'indra/cmake/OPENAL.cmake')
-rw-r--r-- | indra/cmake/OPENAL.cmake | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/indra/cmake/OPENAL.cmake b/indra/cmake/OPENAL.cmake index d01c680ed1..a3e1fb924e 100644 --- a/indra/cmake/OPENAL.cmake +++ b/indra/cmake/OPENAL.cmake @@ -9,18 +9,26 @@ else (LINUX) endif (LINUX) if (OPENAL) + set(OPENAL_LIB_INCLUDE_DIRS "${LIBS_PREBUILT_DIR}/include/AL") 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-soft) + use_prebuilt_binary(openal_soft) endif (STANDALONE) - set(OPENAL_LIBRARIES - openal - alut + if(WINDOWS) + set(OPENAL_LIBRARIES + OpenAL32 + alut ) + else() + set(OPENAL_LIBRARIES + openal + alut + ) + endif() endif (OPENAL) if (OPENAL) |