diff options
author | Jacek Antonelli | 2009-04-10 19:52:53 -0500 |
---|---|---|
committer | Jacek Antonelli | 2009-04-10 19:52:53 -0500 |
commit | 4d01487fc7bbcb4796b8329589daac0f5867a109 (patch) | |
tree | ddabe22401d498ee983457d910e1d017c002aed1 | |
parent | Help Mac find the right libxml2.2.dylib. (diff) | |
download | meta-impy-4d01487fc7bbcb4796b8329589daac0f5867a109.zip meta-impy-4d01487fc7bbcb4796b8329589daac0f5867a109.tar.gz meta-impy-4d01487fc7bbcb4796b8329589daac0f5867a109.tar.bz2 meta-impy-4d01487fc7bbcb4796b8329589daac0f5867a109.tar.xz |
Help Mac find the right libalut.0.dylib.
-rw-r--r-- | ChangeLog.txt | 4 | ||||
-rw-r--r-- | linden/indra/cmake/OPENAL.cmake | 11 |
2 files changed, 14 insertions, 1 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt index 2886c58..0d02e2c 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt | |||
@@ -1,5 +1,9 @@ | |||
1 | 2009-04-10 Jacek Antonelli <jacek.antonelli@gmail.com> | 1 | 2009-04-10 Jacek Antonelli <jacek.antonelli@gmail.com> |
2 | 2 | ||
3 | * linden/indra/cmake/OPENAL.cmake: | ||
4 | Help Mac find the right libalut.0.dylib. | ||
5 | |||
6 | |||
3 | * linden/indra/cmake/GStreamer.cmake: | 7 | * linden/indra/cmake/GStreamer.cmake: |
4 | Help Mac find the right libxml2.2.dylib. | 8 | Help Mac find the right libxml2.2.dylib. |
5 | 9 | ||
diff --git a/linden/indra/cmake/OPENAL.cmake b/linden/indra/cmake/OPENAL.cmake index f06a38e..908021c 100644 --- a/linden/indra/cmake/OPENAL.cmake +++ b/linden/indra/cmake/OPENAL.cmake | |||
@@ -1,5 +1,8 @@ | |||
1 | # -*- cmake -*- | 1 | # -*- cmake -*- |
2 | 2 | ||
3 | include(Variables) | ||
4 | include(Linking) | ||
5 | |||
3 | set(OPENAL ON CACHE BOOL "Enable OpenAL") | 6 | set(OPENAL ON CACHE BOOL "Enable OpenAL") |
4 | 7 | ||
5 | 8 | ||
@@ -54,7 +57,13 @@ if (OPENAL) | |||
54 | NAMES alut freealut | 57 | NAMES alut freealut |
55 | PATHS ${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release | 58 | PATHS ${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release |
56 | ) | 59 | ) |
57 | else (WINDOWS) | 60 | elseif (DARWIN) |
61 | find_library( ALUT_LIB | ||
62 | NAMES alut.0 | ||
63 | PATHS ${ARCH_PREBUILT_DIRS_RELEASE} | ||
64 | NO_DEFAULT_PATH | ||
65 | ) | ||
66 | else (WINDOWS) | ||
58 | set(ALUT_LIB alut) | 67 | set(ALUT_LIB alut) |
59 | endif (WINDOWS) | 68 | endif (WINDOWS) |
60 | 69 | ||