summaryrefslogtreecommitdiff
path: root/indra/cmake
AgeCommit message (Collapse)Author
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
2012-07-23Make build dependent on version of xcode, not version of OSX for DARWINAura Linden
2012-07-23Changed CMake to work for older and newer versions of OSXAura Linden
2012-07-21fix finding havok libs in relwithdebinfo mode (uses release unless ↵Oz Linden
LL_DEBUG_HAVOK is used
2012-07-20refactor to build llphysicsextensions_tpv package for sublicenseesOz Linden
2012-07-18cmake changes for OSX 10.7Aura Linden
2012-07-11Pull in viewer-development because it's painful. Merge with runitai's help.simon@Simon-PC.lindenlab.com
2012-07-11Changed windows to always use havok Hybrid in RelWithDebInfo. Windows no ↵Matthew Breindel (Falcon)
longer uses Havok Debug. On other platforms, use of Debug vs Fulldebug in RelWithDebInfo is still governed by LL_DEBUG_HAVOK
2012-07-11Hopefully fixed windows build. Now support -DLL_DEBUG_HAVOK:BOOL=ON to ↵Matthew Breindel (Falcon)
enable Havok Hyrbid (fulldebug) libs to link in Windows RelWithDebInfo. On other platforms, that flag will cause RelWithDebInfo to link against Havok fulldebug libs. The rest of the time, RelWithDebInfo will link to Havok Debug and Debug will link to Havok Fulldebug
2012-07-10Updating Havok.cmake to support all 3 major build configurations on all ↵Matthew Breindel (Falcon)
platforms. This is incomplete and requires additional changes to the 3p-havok-source repo and the llphysicsextensions-src repo.
2012-07-10experimental - try 10.6 SDK and lvmgcc42 on TeamCityOz Linden
2012-07-05partial changes for building with the llphysicsextensions source packageOz Linden
2012-07-05successful build with llphysicsextensions stubOz Linden
2012-08-02mergeBrad Payne (Vir Linden)
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-05begin integrating building of llphysicsextensions from source here (incomplete)Oz Linden
2012-07-03remove some cmake output that is no longer neededOz Linden
2012-07-02Merge 3.3.3 release with Drano HTTP library at 3.3.0Monty Brandenberg
Big delta was converting the new texture debugger support code to the new library. Viewer manifest should probably get an eyeball before release.
2012-06-28MergeDave Parks
2012-06-28mergeDave Parks
2012-06-28merge up to 3.3.3-releaseOz Linden
2012-06-27merge changes for DRTVWR-167Oz Linden
2012-06-22Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.Todd Stinson
2012-06-22mergeBrad Payne (Vir Linden)
2012-06-21merge changes for DRTVWR-168Oz Linden
2012-06-15MergeDave Parks
2012-06-12Enable /LARGEADDRESSAWARE compiler flag for windows compilingTank_Master
This allows the app to allocate up to 4GB memory on 64bit hosts and 32bit hosts with PAE instead of 2GB 32bit stock OSs will still be limited to 2GB, with no bemnifit or negigitive impact This has the benifit of not crashing the viewer when the viewer memory exceeds 2GB on 64bit hosts Linux and Mac by nature use up to 4GB for a 32bit app, even on a 32bit host