From 738c7546087b5c5fa049be0563623221ef5716c6 Mon Sep 17 00:00:00 2001 From: Alain Linden Date: Fri, 14 Jan 2011 09:03:22 -0800 Subject: windows autobuildibatized (bye bye install.py...) --- indra/llaudio/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/llaudio') diff --git a/indra/llaudio/CMakeLists.txt b/indra/llaudio/CMakeLists.txt index 21ec622819..632e5d46e3 100644 --- a/indra/llaudio/CMakeLists.txt +++ b/indra/llaudio/CMakeLists.txt @@ -24,6 +24,7 @@ include_directories( ${VORBIS_INCLUDE_DIRS} ${OPENAL_LIB_INCLUDE_DIRS} ${FREEAULT_LIB_INCLUDE_DIRS} + ${FMOD_INCLUDE_DIR} ) set(llaudio_SOURCE_FILES -- cgit v1.3 From 88f507f9ccae33a3fa9b3706a96af5c87db804b5 Mon Sep 17 00:00:00 2001 From: Alain Linden Date: Tue, 1 Mar 2011 15:32:35 -0800 Subject: fixes to get openal working on windows. --- autobuild.xml | 12 ++++++++++++ indra/cmake/OPENAL.cmake | 14 +++++++++++--- indra/llaudio/llaudioengine_openal.cpp | 2 ++ indra/llaudio/llaudioengine_openal.h | 2 +- 4 files changed, 26 insertions(+), 4 deletions(-) (limited to 'indra/llaudio') diff --git a/autobuild.xml b/autobuild.xml index 8dd2f91718..819bc27c1e 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1301,6 +1301,18 @@ name linux + windows + + archive + + hash + 04df406f3e5d04cf176660bdac66c3a1 + url + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-openal/rev/222391/arch/CYGWIN/installer/openal-1.12.854-1.1.0-windows-20110301.tar.bz2 + + name + windows + version 3ad86a1c diff --git a/indra/cmake/OPENAL.cmake b/indra/cmake/OPENAL.cmake index ed483e5aea..a3e1fb924e 100644 --- a/indra/cmake/OPENAL.cmake +++ b/indra/cmake/OPENAL.cmake @@ -9,6 +9,7 @@ else (LINUX) endif (LINUX) if (OPENAL) + set(OPENAL_LIB_INCLUDE_DIRS "${LIBS_PREBUILT_DIR}/include/AL") if (STANDALONE) include(FindPkgConfig) include(FindOpenAL) @@ -17,10 +18,17 @@ if (OPENAL) else (STANDALONE) use_prebuilt_binary(openal_soft) endif (STANDALONE) - set(OPENAL_LIBRARIES - openal - alut + if(WINDOWS) + set(OPENAL_LIBRARIES + OpenAL32 + alut ) + else() + set(OPENAL_LIBRARIES + openal + alut + ) + endif() endif (OPENAL) if (OPENAL) diff --git a/indra/llaudio/llaudioengine_openal.cpp b/indra/llaudio/llaudioengine_openal.cpp index e352045291..34a057dcc0 100644 --- a/indra/llaudio/llaudioengine_openal.cpp +++ b/indra/llaudio/llaudioengine_openal.cpp @@ -32,6 +32,8 @@ #include "lllistener_openal.h" +const float LLAudioEngine_OpenAL::WIND_BUFFER_SIZE_SEC = 0.05f; + LLAudioEngine_OpenAL::LLAudioEngine_OpenAL() : mWindGen(NULL), diff --git a/indra/llaudio/llaudioengine_openal.h b/indra/llaudio/llaudioengine_openal.h index 258febb1a8..6639d9dfe6 100644 --- a/indra/llaudio/llaudioengine_openal.h +++ b/indra/llaudio/llaudioengine_openal.h @@ -67,7 +67,7 @@ class LLAudioEngine_OpenAL : public LLAudioEngine int mNumEmptyWindALBuffers; static const int MAX_NUM_WIND_BUFFERS = 80; - static const float WIND_BUFFER_SIZE_SEC = 0.05f; // 1/20th sec + static const float WIND_BUFFER_SIZE_SEC; // 1/20th sec }; class LLAudioChannelOpenAL : public LLAudioChannel -- cgit v1.3 From 12c2fd2ef051ca922f0d3076bc8160820980b6e2 Mon Sep 17 00:00:00 2001 From: "Andrew A. de Laix" Date: Mon, 7 Mar 2011 14:23:09 -0800 Subject: update ogg-vorbis archive usage for darwin. --- autobuild.xml | 4 ++-- indra/llaudio/llaudiodecodemgr.cpp | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) (limited to 'indra/llaudio') diff --git a/autobuild.xml b/autobuild.xml index 37388a8fa4..0736a6afca 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1196,9 +1196,9 @@ archive hash - 510c88fb183556b8c5fba25eb0c3d85e + 57f32a1a670f06a4dc036eb1164ad9d7 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ogg-vorbis-1.03-1.1.2-darwin-20101004.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-ogvorbis/rev/221801/arch/Darwin/installer/ogg_vorbis-1.1.3-1.2.0-darwin-20110222.tar.bz2 name darwin diff --git a/indra/llaudio/llaudiodecodemgr.cpp b/indra/llaudio/llaudiodecodemgr.cpp index 01dfd03c18..84105ddfca 100644 --- a/indra/llaudio/llaudiodecodemgr.cpp +++ b/indra/llaudio/llaudiodecodemgr.cpp @@ -680,4 +680,10 @@ BOOL LLAudioDecodeMgr::addDecodeRequest(const LLUUID &uuid) return FALSE; } - +#ifdef LL_DARWIN +// HACK: to fool the compiler into not emitting unused warnings. +namespace { + const ov_callbacks callback_array[4] = {OV_CALLBACKS_DEFAULT, OV_CALLBACKS_NOCLOSE, OV_CALLBACKS_STREAMONLY, + OV_CALLBACKS_STREAMONLY_NOCLOSE}; +} +#endif -- cgit v1.3 From ec0c28ad8383dd6b342a317d15d44015fde15416 Mon Sep 17 00:00:00 2001 From: Andrew de Laix Date: Mon, 14 Mar 2011 20:24:55 +0000 Subject: update ogg-vorbis archive for linux. --- autobuild.xml | 4 ++-- indra/llaudio/llaudiodecodemgr.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/llaudio') diff --git a/autobuild.xml b/autobuild.xml index 2848a7e0f7..5be2a6fa70 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1232,9 +1232,9 @@ archive hash - d4bda5baabfbfbd92ea7bd2a48c7fb8a + 17c000ceef32c0623d038b4c73791bee url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ogg-vorbis-1.2.0-linux-20100929.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-ogvorbis/rev/222841/arch/Linux/installer/ogg_vorbis-1.1.3-1.2.0-linux-20110307.tar.bz2 name linux diff --git a/indra/llaudio/llaudiodecodemgr.cpp b/indra/llaudio/llaudiodecodemgr.cpp index 84105ddfca..f0b44f97d2 100644 --- a/indra/llaudio/llaudiodecodemgr.cpp +++ b/indra/llaudio/llaudiodecodemgr.cpp @@ -680,7 +680,7 @@ BOOL LLAudioDecodeMgr::addDecodeRequest(const LLUUID &uuid) return FALSE; } -#ifdef LL_DARWIN +#if LL_DARWIN || LL_LINUX // HACK: to fool the compiler into not emitting unused warnings. namespace { const ov_callbacks callback_array[4] = {OV_CALLBACKS_DEFAULT, OV_CALLBACKS_NOCLOSE, OV_CALLBACKS_STREAMONLY, -- cgit v1.3