diff options
| author | Adam Moss <moss@lindenlab.com> | 2008-12-02 20:35:40 +0000 |
|---|---|---|
| committer | Adam Moss <moss@lindenlab.com> | 2008-12-02 20:35:40 +0000 |
| commit | fd46865a502036b9e4414e7ec4950faf551b1f14 (patch) | |
| tree | 634dbca07e829d3906ed555341118c361aa1bb14 /indra/llaudio | |
| parent | de7d6cf4dfa1db2945e3ed4a3e8257d72674a496 (diff) | |
QAR-1040 maint-viewer-11 + OpenAL combo mergeme
svn merge -c104451
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/openal-maint-viewer-11-combo-r104448
Diffstat (limited to 'indra/llaudio')
| -rw-r--r-- | indra/llaudio/CMakeLists.txt | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/indra/llaudio/CMakeLists.txt b/indra/llaudio/CMakeLists.txt index ebedcab4bf..235248ee73 100644 --- a/indra/llaudio/CMakeLists.txt +++ b/indra/llaudio/CMakeLists.txt @@ -5,10 +5,12 @@ project(llaudio) include(00-Common) include(Audio) include(FMOD) +include(OPENAL) include(LLCommon) include(LLMath) include(LLMessage) include(LLVFS) +include(LLMedia) include_directories( ${FMOD_INCLUDE_DIR} @@ -20,6 +22,9 @@ include_directories( ${VORBISENC_INCLUDE_DIRS} ${VORBISFILE_INCLUDE_DIRS} ${VORBIS_INCLUDE_DIRS} + ${OPENAL_LIB_INCLUDE_DIRS} + ${FREEAULT_LIB_INCLUDE_DIRS} + ${LLMEDIA_INCLUDE_DIRS} ) set(llaudio_SOURCE_FILES @@ -38,6 +43,7 @@ set(llaudio_HEADER_FILES llaudiodecodemgr.h vorbisdecode.h vorbisencode.h + windgen.h ) if (FMOD) @@ -59,6 +65,18 @@ if (FMOD) endif (LINUX) endif (FMOD) +if (OPENAL) + list(APPEND llaudio_SOURCE_FILES + audioengine_openal.cpp + listener_openal.cpp + ) + + list(APPEND llaudio_HEADER_FILES + audioengine_openal.h + listener_openal.h + ) +endif (OPENAL) + set_source_files_properties(${llaudio_HEADER_FILES} PROPERTIES HEADER_FILE_ONLY TRUE) |