summaryrefslogtreecommitdiff
path: root/indra/cmake
AgeCommit message (Collapse)Author
2013-06-18merge with viewer-releaseNyx Linden
2013-05-21mergeBrad Payne (Vir Linden)
2013-05-21revise test for hg to detect and ignore incorrect results from cygwin hgOz Linden
2013-05-07merge changes for DRTVWR-299Oz Linden
2013-04-19merge up to latest viewer-development for merge to 3.5.2Oz Linden
2013-04-19merge changes for DRTVWR-294Oz Linden
2013-04-18add newlineOz Linden
2013-04-18Blank line on end of files as per commit hook requirementscallum_linden
2013-04-17fix for missed merge changescallum_linden
2013-04-17Merge with viewer-developmentcallum_linden
2013-04-16merge up to 3.5.2 developmentOz Linden
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2013-03-28Google Breakpad FixGraham Madarasz (Graham Linden)
2013-02-21MAINT-2389: Change viewer to Boost package without ucontext.h.Nat Goodspeed
In autobuild.xml, specify today's build of the Boost package that includes the Boost.Context library, and whose boost::dcoroutines library uses Boost.Context exclusively instead of its previous context-switching underpinnings (source of the ucontext.h dependency). Add BOOST_CONTEXT_LIBRARY to Boost.cmake and Copy3rdPartyLibs.cmake. Link it with the viewer and with the lllogin.cpp test executable. Track new Boost package convention that our (early, unofficial) Boost.Coroutine library is now accessed as boost/dcoroutine/etc.h and boost::dcoroutines::etc. Remove #include <boost/coroutine/coroutine.hpp> from llviewerprecompiledheaders.h and lllogin.cpp: old rule that Boost.Coroutine header must be #included before anything else that might use ucontext.h is gone now that we no longer depend on ucontext.h. In fact remove -D_XOPEN_SOURCE in 00-Common.cmake because that was inserted specifically to work around a known problem with the ucontext.h facilities.
2013-02-04Nix trying to copy the debug fmod DLLGraham Madarasz (Graham)
2013-02-04More path fixups in stagingGraham Madarasz (Graham)
2013-02-04Dos2Unix Line endingsSovereign Engineer
2013-02-01Added copy of libfmodex .so for linuxGraham Madarasz (Graham)
2013-02-01Removed (most) references to older FMOD library - still a little Linux clean ↵callum_linden
up left
2013-01-24merging in viewer-beta.Nyx Linden
Most of the merge was clean, a couple conflicts. Brought over a couple patches manually for llpolymesh.
2013-01-18first push - patch from CmdCupCake plus force FMODEX oncallum_linden
2013-01-08Automated merge with https://bitbucket.org/lindenlab/viewer-tigerDave Parks
2013-01-08merge changes for DRTVWR-250Oz Linden
2012-12-20Disabling build of headless appearance utilityDon Kjer
2012-12-12Pull and merge viewer-developmentsimon@Simon-PC.lindenlab.com
2012-12-12Updating linux libGLOD to match darwin namingDon Kjer
2012-12-11Automated merge with ssh://bitbucket.org/lindenlab/sunshine-internalLogan Dethrow
2012-12-11Fix for building on case-sensitive mac filesystems. Fix to remove unwind ↵Don Kjer
spam warnings while linking on xcode 4.5.2 builds
2012-12-11Automated merge with ssh://bitbucket.org/lindenlab/viewer-developmentLogan Dethrow
2012-12-07Removed duplicated block of code in LLAddBuildTest.cmake. Added comment to ↵Logan Dethrow
point to duplicated code. Replaced hard-coded tcmalloc link option with variable that is created in GooglePerfTools.cmake.
2012-12-06On Linux now use the default system python instead of defaulting to ↵Logan Dethrow
python2.5. This was a holdover from when on linden systems 2.5 was newer than the default, instead of older.
2012-12-04Pull in upstream viewer-development via viewer-lionsimon@Simon-PC.lindenlab.com
2012-12-04Pull and merge viewer-developmentsimon@Simon-PC.lindenlab.com
2012-11-28SH-3563. Pull and merge from viewer-development. Modest code changes to fix ↵prep
alignment issue in llAppearance.
2012-11-26merge changes for DRTVWR-249Oz Linden
2012-11-20Automated merge with https://bitbucket.org/lindenlab/viewer-developmentDave Parks
2012-11-20merge changes for DRTVWR-246Oz Linden
2012-11-19MAINT-1841 Fix for mac/linux buildDave Parks
2012-11-19Automated merge with https://bitbucket.org/lindenlab/viewer-catDave Parks
2012-11-19MAINT-1841 Use NVAPI to force NVIDIA GPU power management mode to prefer max ↵Dave Parks
performance Reviewed by Simon.
2012-11-16Fix Boost shared-library version suffixes in Copy3rdPartyLibs.cmake.Nat Goodspeed
2012-11-16Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2012-11-15Remove Boost version "1_45" baked into library names.Nat Goodspeed
On Windows, LLPrimitive.cmake named four Boost libraries with names ending in the string 1_45. Now that we're trying to upgrade Boost to 1.52, those suffixes are inappropriate. Fortunately the libraries in our current Boost package do not have version-stamped names, so we hope this fix can survive for several Boost upgrades to come.
2012-11-13Stupid typo in Boost Cmake filecallum_linden
2012-11-13Update Windows lib names for new Boost packagecallum_linden
2012-11-12First round of fixes to make viewer work with Boost 1.52callum_linden
2012-11-08Automated merge with http://bitbucket.org/lindenlab/viewer-developmentDave Parks
2012-11-07Automated merge with http://bitbucket.org/lindenlab/viewer-betaDave Parks
2012-11-07MAINT-1815 Fix for excessive memory usage in Mayfair. Disable tcmalloc. ↵Dave Parks
Disable private memory pools. Make viewer large address aware on windows. Reviewed by Kelly
2012-11-07Merge. Refresh DRTVWR-209 with 3.4.2-beta1 code.Monty Brandenberg
Two fairly simple conflicts: dead stats sending code in the texture fetch code (new llcorehttp library) and the cleanup code in llappviewer was moved around in 3.4.x.