From 8ba2b388769e245ec1b49b7d6d4b0372d684ff86 Mon Sep 17 00:00:00 2001 From: Don Kjer Date: Thu, 13 Sep 2012 10:25:48 +0000 Subject: Fleshed out target_link_libraries dependencies between libraries. Appearance utility now reads avatar_lad.xml during stubbed out params processing. --- indra/llaudio/CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'indra/llaudio/CMakeLists.txt') diff --git a/indra/llaudio/CMakeLists.txt b/indra/llaudio/CMakeLists.txt index 632e5d46e3..24d2531106 100644 --- a/indra/llaudio/CMakeLists.txt +++ b/indra/llaudio/CMakeLists.txt @@ -88,6 +88,10 @@ list(APPEND llaudio_SOURCE_FILES ${llaudio_HEADER_FILES}) add_library (llaudio ${llaudio_SOURCE_FILES}) target_link_libraries( llaudio + ${LLCOMMON_LIBRARIES} + ${LLMATH_LIBRARIES} + ${LLMESSAGE_LIBRARIES} + ${LLVFS_LIBRARIES} ${VORBISENC_LIBRARIES} ${VORBISFILE_LIBRARIES} ${VORBIS_LIBRARIES} -- cgit v1.2.3 From ba3e89b5c731ed6dc36d4650928be8081b3289f5 Mon Sep 17 00:00:00 2001 From: callum_linden Date: Fri, 18 Jan 2013 16:43:19 -0800 Subject: first push - patch from CmdCupCake plus force FMODEX on --- indra/llaudio/CMakeLists.txt | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) (limited to 'indra/llaudio/CMakeLists.txt') diff --git a/indra/llaudio/CMakeLists.txt b/indra/llaudio/CMakeLists.txt index 632e5d46e3..e404cfc10e 100644 --- a/indra/llaudio/CMakeLists.txt +++ b/indra/llaudio/CMakeLists.txt @@ -5,7 +5,13 @@ project(llaudio) include(00-Common) include(Audio) include(LLAudio) -include(FMOD) +if (FMODEX) + include(FMODEX) + set(FMOD OFF) +endif (FMODEX) +if (NOT FMODEX) + include(FMOD) +endif (NOT FMODEX) include(OPENAL) include(LLCommon) include(LLMath) @@ -24,7 +30,6 @@ include_directories( ${VORBIS_INCLUDE_DIRS} ${OPENAL_LIB_INCLUDE_DIRS} ${FREEAULT_LIB_INCLUDE_DIRS} - ${FMOD_INCLUDE_DIR} ) set(llaudio_SOURCE_FILES @@ -44,6 +49,23 @@ set(llaudio_HEADER_FILES llwindgen.h ) +if (FMODEX) + include_directories( + ${FMODEX_INCLUDE_DIR} + ) + list(APPEND llaudio_SOURCE_FILES + llaudioengine_fmodex.cpp + lllistener_fmodex.cpp + llstreamingaudio_fmodex.cpp + ) + + list(APPEND llaudio_HEADER_FILES + llaudioengine_fmodex.h + lllistener_fmodex.h + llstreamingaudio_fmodex.h + ) +endif (FMODEX) + if (FMOD) include_directories( ${FMOD_INCLUDE_DIR} -- cgit v1.2.3 From e503acf7b8f6721a4801e2c887b50ce67c0d307d Mon Sep 17 00:00:00 2001 From: callum_linden Date: Wed, 23 Jan 2013 13:28:54 -0800 Subject: Fix llaudio CMake file to not use FMOD - only FMODEX --- indra/llaudio/CMakeLists.txt | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'indra/llaudio/CMakeLists.txt') diff --git a/indra/llaudio/CMakeLists.txt b/indra/llaudio/CMakeLists.txt index e404cfc10e..b2d7b7c911 100644 --- a/indra/llaudio/CMakeLists.txt +++ b/indra/llaudio/CMakeLists.txt @@ -5,13 +5,8 @@ project(llaudio) include(00-Common) include(Audio) include(LLAudio) -if (FMODEX) - include(FMODEX) - set(FMOD OFF) -endif (FMODEX) -if (NOT FMODEX) - include(FMOD) -endif (NOT FMODEX) +include(FMODEX) +set(FMOD OFF) include(OPENAL) include(LLCommon) include(LLMath) -- cgit v1.2.3 From b0f2f02333a87598299b490a1e42eb42a8125f74 Mon Sep 17 00:00:00 2001 From: callum_linden Date: Fri, 1 Feb 2013 08:44:52 -0800 Subject: Removed (most) references to older FMOD library - still a little Linux clean up left --- indra/llaudio/CMakeLists.txt | 25 ------------------------- 1 file changed, 25 deletions(-) (limited to 'indra/llaudio/CMakeLists.txt') diff --git a/indra/llaudio/CMakeLists.txt b/indra/llaudio/CMakeLists.txt index b2d7b7c911..f27bcb27d1 100644 --- a/indra/llaudio/CMakeLists.txt +++ b/indra/llaudio/CMakeLists.txt @@ -6,7 +6,6 @@ include(00-Common) include(Audio) include(LLAudio) include(FMODEX) -set(FMOD OFF) include(OPENAL) include(LLCommon) include(LLMath) @@ -61,30 +60,6 @@ if (FMODEX) ) endif (FMODEX) -if (FMOD) - include_directories( - ${FMOD_INCLUDE_DIR} - ) - - list(APPEND llaudio_SOURCE_FILES - llaudioengine_fmod.cpp - lllistener_fmod.cpp - llstreamingaudio_fmod.cpp - ) - - list(APPEND llaudio_HEADER_FILES - llaudioengine_fmod.h - lllistener_fmod.h - llstreamingaudio_fmod.h - ) - - if (LINUX OR DARWIN) - set_source_files_properties(llaudioengine_fmod.cpp - llstreamingaudio_fmod.cpp - COMPILE_FLAGS -Wno-write-strings) - endif (LINUX OR DARWIN) -endif (FMOD) - if (OPENAL) list(APPEND llaudio_SOURCE_FILES llaudioengine_openal.cpp -- cgit v1.2.3 From bf6182daa8b4d7cea79310547f71d7a3155e17b0 Mon Sep 17 00:00:00 2001 From: Graham Madarasz Date: Fri, 29 Mar 2013 07:50:08 -0700 Subject: Update Mac and Windows breakpad builds to latest --- indra/llaudio/CMakeLists.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 indra/llaudio/CMakeLists.txt (limited to 'indra/llaudio/CMakeLists.txt') diff --git a/indra/llaudio/CMakeLists.txt b/indra/llaudio/CMakeLists.txt old mode 100644 new mode 100755 -- cgit v1.2.3