diff options
| author | Anders Arnholm | 2008-12-13 18:49:24 +0100 |
|---|---|---|
| committer | Anders Arnholm | 2008-12-13 18:49:24 +0100 |
| commit | c7fca44072ae101b986a87c87ebda1e99de5141a (patch) | |
| tree | a9884591ca07983234a0ed41275d7b92dc513f46 /linden/indra/cmake | |
| parent | Merge 1.0.0 RC2 into openal (diff) | |
| parent | Merge branch 'next' of git://github.com/jacek/imprudence into next (diff) | |
| download | meta-impy-c7fca44072ae101b986a87c87ebda1e99de5141a.zip meta-impy-c7fca44072ae101b986a87c87ebda1e99de5141a.tar.gz meta-impy-c7fca44072ae101b986a87c87ebda1e99de5141a.tar.bz2 meta-impy-c7fca44072ae101b986a87c87ebda1e99de5141a.tar.xz | |
Merge branch 'next' into openal
Conflicts:
ChangeLog.txt
Diffstat (limited to 'linden/indra/cmake')
| -rw-r--r-- | linden/indra/cmake/OPENAL.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/cmake/OPENAL.cmake b/linden/indra/cmake/OPENAL.cmake index 277e3f9..a2bae5d 100644 --- a/linden/indra/cmake/OPENAL.cmake +++ b/linden/indra/cmake/OPENAL.cmake | |||
| @@ -26,7 +26,7 @@ if (OPENAL) | |||
| 26 | 26 | ||
| 27 | find_path(OPENAL_INCLUDE_DIR | 27 | find_path(OPENAL_INCLUDE_DIR |
| 28 | NAMES al.h | 28 | NAMES al.h |
| 29 | PATHS ${LIBS_PREBUILT_DIR}/include | 29 | PATHS ${LIBS_PREBUILT_DIR}/include /usr/include/AL |
| 30 | ) | 30 | ) |
| 31 | 31 | ||
| 32 | if (NOT OPENAL_INCLUDE_DIR) | 32 | if (NOT OPENAL_INCLUDE_DIR) |
| @@ -56,7 +56,7 @@ if (OPENAL) | |||
| 56 | 56 | ||
| 57 | find_path(ALUT_INCLUDE_DIR | 57 | find_path(ALUT_INCLUDE_DIR |
| 58 | NAMES alut.h | 58 | NAMES alut.h |
| 59 | PATHS ${LIBS_PREBUILT_DIR}/include | 59 | PATHS ${LIBS_PREBUILT_DIR}/include /usr/include/AL |
| 60 | ) | 60 | ) |
| 61 | 61 | ||
| 62 | if (NOT ALUT_INCLUDE_DIR) | 62 | if (NOT ALUT_INCLUDE_DIR) |