aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJacek Antonelli2009-03-12 09:16:53 -0500
committerJacek Antonelli2009-03-12 09:16:53 -0500
commit4932af1c6806c351aa687433c10ba57d2a502c59 (patch)
tree63301754a04068f6f57c6062b883ff830e421e1f
parentRemoved redundant/unnecessary OpenAL lib names and paths (diff)
downloadmeta-impy-4932af1c6806c351aa687433c10ba57d2a502c59.zip
meta-impy-4932af1c6806c351aa687433c10ba57d2a502c59.tar.gz
meta-impy-4932af1c6806c351aa687433c10ba57d2a502c59.tar.bz2
meta-impy-4932af1c6806c351aa687433c10ba57d2a502c59.tar.xz
Don't find specific OpenAL lib locations on Mac/Linux.
Linking that way is bad. Just use -lopenal -lalut instead.
-rw-r--r--ChangeLog.txt7
-rw-r--r--linden/indra/cmake/OPENAL.cmake10
2 files changed, 9 insertions, 8 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index ed894cc..dc7712b 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,10 @@
12009-03-12 Jacek Antonelli <jacek.antonelli@gmail.com>
2
3 * linden/indra/cmake/OPENAL.cmake:
4 Don't find specific OpenAL lib locations on Mac/Linux.
5 Linking that way is bad. Just use -lopenal -lalut instead.
6
7
12009-03-11 Jacek Antonelli <jacek.antonelli@gmail.com> 82009-03-11 Jacek Antonelli <jacek.antonelli@gmail.com>
2 9
3 * linden/indra/cmake/OPENAL.cmake: 10 * linden/indra/cmake/OPENAL.cmake:
diff --git a/linden/indra/cmake/OPENAL.cmake b/linden/indra/cmake/OPENAL.cmake
index 2ebee01..11dcdc7 100644
--- a/linden/indra/cmake/OPENAL.cmake
+++ b/linden/indra/cmake/OPENAL.cmake
@@ -15,10 +15,7 @@ if (OPENAL)
15 PATHS ${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release 15 PATHS ${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release
16 ) 16 )
17 else (WINDOWS) 17 else (WINDOWS)
18 find_library(OPENAL_LIB 18 set(OPENAL_LIB openal)
19 NAMES openal
20 PATHS ${ARCH_PREBUILT_DIRS_RELEASE}
21 )
22 endif (WINDOWS) 19 endif (WINDOWS)
23 20
24 if (NOT OPENAL_LIB) 21 if (NOT OPENAL_LIB)
@@ -52,10 +49,7 @@ if (OPENAL)
52 PATHS ${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release 49 PATHS ${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release
53 ) 50 )
54 else (WINDOWS) 51 else (WINDOWS)
55 find_library(ALUT_LIB 52 set(ALUT_LIB alut)
56 NAMES alut
57 PATHS ${ARCH_PREBUILT_DIRS_RELEASE}
58 )
59 endif (WINDOWS) 53 endif (WINDOWS)
60 54
61 if (NOT ALUT_LIB) 55 if (NOT ALUT_LIB)