summaryrefslogtreecommitdiff
path: root/indra/cmake
AgeCommit message (Collapse)Author
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.
2012-10-30pull back changes from 3.4.1-beta11Oz Linden
2012-10-30merge changes for DRTVWR-235Oz Linden
2012-10-24pull back changes (enable tcmalloc) from 3.4.1-beta10Oz Linden
2012-10-24Switching to system osmesa library instead of pre-packaged libraryDon Kjer
2012-10-22Enable tcmallocDave Parks
2012-10-20Removing build.sh darwin symbols hack. Adding '-g' to both CFLAGS and ↵Don Kjer
CXXFLAG to have cmake generation debug symbols in xcode.
2012-10-18Removing -g flag from mac buildsDon Kjer
2012-10-17Adding '-g' to mac buildsDon Kjer
2012-10-17Fix for headless appearance utility not linking correctlyDon Kjer
2012-10-15Speeding up cmake configuration, especially on linux. Re-arranged ↵Don Kjer
llrender/llwindow cmake source a bit
2012-10-13Adding libdl to OSMesa16 link lineDon Kjer
2012-10-11Adding multi-arch hints to CMake, allowing it to correctly find libraries on ↵Don Kjer
multi-arch debian-based systems.
2012-10-11Updating linux build to gcc4.6Don Kjer
2012-10-04Updating to newer build of tcmalloc/google perf tools. Removing X11 library ↵Don Kjer
dependencies from headless libraries
2012-10-04Limiting headless builds to linuxDon Kjer
2012-10-04Building headless and non-headless libraries side-by-side, removing the need ↵Don Kjer
for the BAKING cmake setting.
2012-10-04Removing server-related cmake cruft. Fixing libGLU warnings on linux.Don Kjer
2012-09-24Cherry-picked windows build fixes from sunshine-experimentalDon Kjer
2012-09-20Pull and merge from ↵William Todd Stinson
ssh://hg@bitbucket.org/stinson_linden/viewer-beta-drtvwr-179.
2012-09-20reapply 4a8388c13e56: MAINT-646 Enable /fp:fast in Visual StudioDave Parks
2012-09-19BUILDFIX: enabling the building of the viewer/appearance backend with ↵Nyx Linden
headless mesa
2012-09-14Removed appearance utility from viewer source. Added appearance utility ↵Don Kjer
autobuild package.
2012-09-12MAINT-1503 Minimal set of changes needed to safely disable tcmallocDave Parks
2012-09-12initial attempt to restore changes that make removing tcmalloc possible; not ↵Oz Linden
tested
2012-09-10Backing out the changes contributing to DRTVWR-167 and DRTVWR-179 from the ↵William Todd Stinson
repository.
2012-09-07DRTVWR-209 Merge of viewer-development with SH-3316 drano-http code.Monty Brandenberg
Cmake files not merged correctly and had to be done by hand. New memory allocation made some memory usage tests in the llcorehttp integration tests no longer valid. Would like to work on LLLog sometime and get it to be consistent. Special flags needed for windows build of example program.
2012-09-07Further attempts to erradicate TCMALLOCsimon@Simon-PC.lindenlab.com
2012-09-05Merge in latest viewer-developmentsimon@Simon-PC.lindenlab.com
2012-09-04Cleanup actions from code review of llappearance with nyxDon Kjer
2012-09-03Merge VirLinden/sunshine -> don_linden/sunshine-experimentalDon Kjer
2012-08-31mergeDave Parks
2012-08-31MAINT-1503 Disable tcmalloc and fix remaining alignment issues.Dave Parks
2012-08-22merge changes for DRTVWR-202Oz Linden
2012-08-22Fix up white space to follow coding policy guidelinescallum_linden
2012-08-22merge changes for DRTVWR-203Oz Linden
2012-08-21SH-3261 SH-3324 WIP Starting extraction of wearable/appearance librariesNyx (Neal Orman)
First pass at cmake configs, and starting to try to move wearable class. Things are broken, checkpointing work to collaborate.
2012-08-17Minor change required for merge from viewer-developmentAura Linden
2012-08-17Merged in from viewer-development.Aura Linden
2012-08-08More optional signing stuff for 10.5Aura Linden
2012-08-08Pulled merge, changed . to , in viewer-manifestAura Linden
2012-08-08More optional config for 10.5 buildsAura Linden
2012-08-06Removed (unworking) code signing parameters from autobuild (wrong place)callumprentice
Added them to correct place (Cmake config)
2012-08-03Merge of viewer-development (3.4.1).Monty Brandenberg
2012-08-02MAINT-515 FIX, CHOP-100 FIX - technically we are avoiding these issues ↵Brad Payne (Vir Linden)
rather than fixing them; changing llcommon to be statically linked avoids the symbol issues with llcommon.dll
2012-07-31merge up to latest viewer-developmentOz Linden
2012-07-25Fix to build with code signing option (patch from STORM-1900)callum_linden
2012-07-24merge up to latest viewer-pathfinding (including 3.3.4)Oz Linden
2012-07-24merge to viewer-developmentoOz Linden
2012-07-23Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.Todd Stinson