summaryrefslogtreecommitdiff
path: root/indra/llaudio/CMakeLists.txt
AgeCommit message (Collapse)Author
2024-08-03Bring back FMOD, to be used on Fedora only, thoughErik Kundiman
https://megapahit.com/show_bug.cgi?id=64 Dullahan is still not working, something in webrtc-voice is breaking it too. But at least we're halfway now that we don't have to use Fedora's OpenAL that is in conflict with Dullahan/CEF.
2024-07-28Merge remote-tracking branch 'secondlife/release/2024.06-atlasaurus' into ↵Erik Kundiman
2024.06-atlasaurus
2024-02-09SL-19585 Try replacing fmod with openalAndrey Kleshchev
Since now VLC is responsible for played parcel media (should be since SL-19042) should be possible to switch remaining audio to OpenAL with no loss of functionality
2023-08-01llaudio can be installed to the system tooErik Kundiman
2022-09-17SL-17238 Fix coding policy build issuesAndrey Kleshchev
2022-05-01Remove setting of HEADER_FILE_ONLY on .h* files, cmake automaticallyNicky
sets the property on those.
2022-04-17Switch to target_include_directoriesNicky
All 3Ps include dirs are treated as SYSTEM, this will stop compilers stop emitting warnings from those files and greatly helps having high warning levels and not being swamped by warnings that come from external libraries.
2022-04-16Streamline fmodstudio/openal targets:Nicky
- Targets now define the appropriate c++ defines, no more hand magic needed for llstartup.cpp - Switch cmakeflage to USE_xxx rather than xxx as it was before. I personally find the USE_X notion more intuitive and it follows how KDU is used. - To be backward compatible OPENAL/FMODSTUDIO flag will be mapped to USE_OPENAL/USE_FMODSTUDIO
2022-04-13Rework cmake, the original plan was to maybe be able to use conan targets ↵Nicky
with the same name (that's why 3ps had names like apr::apr), but it's safer and saner to put the LL 3ps under the ll:: prefix. This also allows means it is possible to get rid of that bad "if( TRAGET ...) return() endif()" pattern and rather use include_guard().
2022-04-06Move CMake files to modernized cmake syntax, step 1.Nicky
Change projects to cmake targetsto get rid of havig to hardcore include directories and link libraries in consumer projects.
2021-03-09This set of changes reverts the merge with master (git revert c83e740) and ↵Callum Prentice
results in a version of the DRTVWR-519 that matches what was presemt before it was deployed as a release viewer *plus* 3 small fixes from Maxim (See commits). This branch can now be used for additional fixes before eventually being used to release D-519 as normal
2021-03-08Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into ↵Brad Payne (Vir Linden)
DRTVWR-519" This reverts commit e61f485a04dc8c8ac6bcf6a24848359092884d14, reversing changes made to 00c47d079f7e958e473ed4083a7f7691fa02dcd5.
2020-09-22Merge branch 'master' into DRTVWR-519Callum Prentice
2020-09-17The folder where the disk cache lives was originally renamed from llvfs to ↵Callum Prentice
llcache but @henri's suggestion that that doesn't reflect the other files in the same place and it should be llfilesystem is a good one so I changed it over
2020-09-16First part of change to remove LLVFS from the Viewer. Consists of code ↵Callum Prentice
changes to remove LLVFS and LLVFSThread classes along with the associated source files. The existing llvfs folder is renamed to llcache. Also includes changes to CMake script in many places to reflect changes. Eventually, llvfile source file and class will be renamed but that is not in this change.
2020-06-02Merge branch 'master' into DRTVWR-503-maintAndrey Lihatskiy
# Conflicts: # indra/newview/CMakeLists.txt # indra/newview/viewer_manifest.py
2020-02-14SL-12707 Build Fails Without FMODAndrey Kleshchev
Also adds correct working directory to RelWithDebInfoOS and enables OpenAl on OS builds for windows
2020-02-04SL-12654 Remove support for building with fmod exAndrey Kleshchev
2020-01-31Merged in SL-11445 Upgrade Fmodex to Fmod StudioAndrey Kleshchev
2015-11-10remove execute permission from many files that should not have itOz Linden
2014-12-15remove redundant include of Audio.cmakeOz Linden
2013-04-19merge changes for DRTVWR-294Oz Linden
2013-04-17Merge with viewer-developmentcallum_linden
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2013-02-01Removed (most) references to older FMOD library - still a little Linux clean ↵callum_linden
up left
2013-01-23Fix llaudio CMake file to not use FMOD - only FMODEXcallum_linden
2013-01-18first push - patch from CmdCupCake plus force FMODEX oncallum_linden
2012-09-13Fleshed out target_link_libraries dependencies between libraries. ↵Don Kjer
Appearance utility now reads avatar_lad.xml during stubbed out params processing.
2011-01-14windows autobuildibatized (bye bye install.py...)Alain Linden
2010-10-18STORM-406: Fix for fmod inclusion in llaudio cmakeMerov Linden
2010-04-24EXT-7005 : Kill unhelpful 'Deprecated conversion from string to char *' ↵Aimee Linden
warnings from fmod_errors.h when building with GCC >=4.2 on Darwin Apply -Wno-write-strings compile flag to llaudioengine_fmod.cpp and llstreamingaudio_fmod.cpp on Darwin as it was on Linux (Amen). Removed unnecessary check for GCC >= 4.2 when applying this flag, as CXX_VERSION_NUMBER it used is only being generated in 00-Common.cmake on Linux at the moment and 4.0 understands -Wno-write-strings anyway.
2009-11-30Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Lynx Linden
2009-11-30Made the gcc version number checking more robust in llaudio'sLynx Linden
CMakeFiles.txt file. Previously it checked for a narrow range of gcc versions via a regex: if (${CXX_VERSION} MATCHES "4.[23]") Now we explicit check for any version >= 4.2: if (${CXX_VERSION_NUMBER} GREATER 419)
2009-11-30remove llvorbisdecode.* - it's long-dead.Tofu Linden
at some point someone inlined this into llaudiodecodemgr and the 'indie' version rotted away.
2009-09-04Fixed the Linux build of viewer-2.0.0-3.Martin Reddy
- Updated linux_updater for new LLStringUtil::getTokens() signature - Ignore compiler warning for string constants not being referred to as const in fmod_error.h Fix for DEV-39457. Reviewed by moss.
2009-08-27svn merge -r 129841:129910 ↵Monroe Williams
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910 svn merge -r 129913:131718 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05 Some branch shenannigans in the pluginapi_05 branch caused this to become a two-part merge.
2008-12-02QAR-1040 maint-viewer-11 + OpenAL combo mergemeAdam Moss
svn merge -c104451 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/openal-maint-viewer-11-combo-r104448
2008-08-29Use target_link_libraries for llaudioBryan O'Sullivan
2008-07-10Check the actual version of the compiler we're going to use to compile the ↵Kyle McKay
sources to determine which options need to be added rather than the version of some other compiler on the system.
2008-06-03Build fixBryan O'Sullivan
2008-06-02Fix Ubuntu compilation problemBryan O'Sullivan
2008-06-02svn merge -r88066:88786 ↵Bryan O'Sullivan
svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge dataserver-is-deprecated for-fucks-sake-whats-with-these-commit-markers