diff options
author | Jacek Antonelli | 2009-03-29 14:59:54 -0500 |
---|---|---|
committer | Jacek Antonelli | 2009-03-29 14:59:54 -0500 |
commit | 5207b3893ad2214ce8aad3a720d087d566738bdc (patch) | |
tree | 66edabde8e1598756fcb490f24d272710f857bd4 | |
parent | Tweaked the list of linked-in gstreamer libs for Mac. (diff) | |
download | meta-impy-5207b3893ad2214ce8aad3a720d087d566738bdc.zip meta-impy-5207b3893ad2214ce8aad3a720d087d566738bdc.tar.gz meta-impy-5207b3893ad2214ce8aad3a720d087d566738bdc.tar.bz2 meta-impy-5207b3893ad2214ce8aad3a720d087d566738bdc.tar.xz |
Using OpenAL framework on Mac after all. Maybe.
-rw-r--r-- | ChangeLog.txt | 4 | ||||
-rw-r--r-- | linden/indra/cmake/OPENAL.cmake | 8 |
2 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt index 5802245..5513449 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt | |||
@@ -1,6 +1,10 @@ | |||
1 | 2009-03-29 Jacek Antonelli <jacek.antonelli@gmail.com> | 1 | 2009-03-29 Jacek Antonelli <jacek.antonelli@gmail.com> |
2 | 2 | ||
3 | * linden/indra/cmake/GStreamer.cmake: | 3 | * linden/indra/cmake/GStreamer.cmake: |
4 | Using OpenAL framework on Mac after all. Maybe. | ||
5 | |||
6 | |||
7 | * linden/indra/cmake/GStreamer.cmake: | ||
4 | Tweaked the list of linked-in gstreamer libs for Mac. | 8 | Tweaked the list of linked-in gstreamer libs for Mac. |
5 | 9 | ||
6 | 10 | ||
diff --git a/linden/indra/cmake/OPENAL.cmake b/linden/indra/cmake/OPENAL.cmake index 11dcdc7..f06a38e 100644 --- a/linden/indra/cmake/OPENAL.cmake +++ b/linden/indra/cmake/OPENAL.cmake | |||
@@ -14,8 +14,14 @@ if (OPENAL) | |||
14 | NAMES openal32 | 14 | NAMES openal32 |
15 | PATHS ${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release | 15 | PATHS ${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release |
16 | ) | 16 | ) |
17 | elseif (DARWIN) | ||
18 | # Look for for system's OpenAL.framework | ||
19 | find_library(OPENAL_LIB | ||
20 | NAMES OpenAL openal | ||
21 | PATHS ${ARCH_PREBUILT_DIRS_RELEASE} | ||
22 | ) | ||
17 | else (WINDOWS) | 23 | else (WINDOWS) |
18 | set(OPENAL_LIB openal) | 24 | set(OPENAL_LIB openal) |
19 | endif (WINDOWS) | 25 | endif (WINDOWS) |
20 | 26 | ||
21 | if (NOT OPENAL_LIB) | 27 | if (NOT OPENAL_LIB) |