summaryrefslogtreecommitdiff
path: root/indra/cmake
AgeCommit message (Collapse)Author
2010-12-16Automated merge up from viewer-developmentLoren Shih
2010-12-09Use 10.5 sdk for nowRoxie Linden
2010-12-03Mergeleyla_linden
2010-12-03updated message template md5sumBrad Payne (Vir Linden)
2010-12-03Switch default platform SDK to 10.6Dave Parks
2010-12-01Automated merge up from viewer-developmentLoren Shih
2010-11-27mergeTofu Buzzard
2010-11-22SH-467 FIX fix of VWR-20809/SNOW-504 lost in mergeNyx (Neal Orman)
re-applying the fix originally committed as c5ddd1e361ae. This allows standalone builds to not depend on stage_third_party_libs but was lost in a merge as referenced in jira. Re-reviewed the code in the patch and it is a valid fix.
2010-11-22SH-468 FIX fix of VWR-20810/SNOW-503 lost in mergeNyx (Neal Orman)
re-applying changeset b987077e9bbb as it was lost in the merge. reviewed the original patch, appears valid.
2010-11-18Merge with viewer-developmentMark Palange (Mani)
2010-11-18SH-350 SH-351 SH-355 FIX ARC fixesNyx (Neal Orman)
Had a few debugging lines in my last checkin. Cleaning up unreviewed changes.
2010-11-18SH-350 SH-351 SH-355 FIX Several fixes for ARCNyx (Neal Orman)
Fixed the texture resolution calculation against the rounding errors we had before. Fixed the bug where linking prims changed the combined cost Fixed the bug where twisting was not computed properly Code reviewed by davep.
2010-11-17Merge with viewer-developmentBryan O'Sullivan
2010-11-17It is safe to use Python 2.7 on Windows, if presentBryan O'Sullivan
2010-11-17Update slvoice dependency for WindowsBryan O'Sullivan
2010-11-16Replace template verification code with an md5sum check.Christian Goetze (CG)
2010-11-15VWR-23839 Pulseaudio support is crashing web media on some new Linux distrosTofu Buzzard
2010-11-10MergeMark Palange (Mani)
2010-11-10CHOP-151 Imported patch from server-trunk to support preprocessor at unit ↵Mark Palange (Mani)
tests. Rev. by Brad
2010-11-05Merge latest lindenlab/viewer-development with mani_linden/viewer-development.brad kittenbrink
2010-11-04SH-396 WIP fix mac teamcity build for mesh-developmentNyx Linden
making sure we're copying over the necessary 3rd party library in the packaging stage
2010-11-04Turned inlining on in windows builds (RelWithDebInfo and Release).brad kittenbrink
This reduces the number of symbols in the viewer binary by about 30%. Also, fixed test errors revealed by inlining being enabled.
2010-10-29Fix for release build (misspelled llprimitive)Dave Parks
2010-10-29SH-262 Fix for debug build on windows.Dave Parks
2010-10-28SH-395 WIP fixing linux build in opensource mesh branchNyx (Neal Orman)
Reverting a previous cmake fix as we're not set up to use debug libraries on non-windows platforms. Also removing references to debug versions of tcmalloc to unstick the build.
2010-10-27SH-395 WIP fix linux opensource mesh teamcity buildNyx (Neal Orman)
cmake wasn't configured to use the right directories on the viewer for debug libraries. Trying to update the config.
2010-10-27SH-392 Port over fix from mesh-development for FBOs on OSXDave Parks
2010-10-25Automated merge up from viewer-developmentLoren Shih
2010-10-20Automated merge up from viewer-developmentLoren Shih
2010-10-16merged VWR-23455: Don't download FMOD unless INSTALL_PROPRIETARY is TRUEBoroondas Gupte
2010-10-16merged VWR-23455: Don't download FMOD unless INSTALL_PROPRIETARY is TRUEBoroondas Gupte
2010-10-16VWR-23455: Don't download FMOD unless INSTALL_PROPRIETARY is TRUEBoroondas Gupte
2010-10-15MergeLeyla Farazha
2010-10-15Automated merge with file:///Users/oz/Work/viewer-developmentOz Linden
2010-10-14Merge from http://hg.secondlife.com/viewer-identity (display names)Leyla Farazha
2010-10-14SH-329 WIP merging in oz's fix for license issues in the mesh branchNyx (Neal Orman)
2010-10-14Updated colladadom.Dave Parks
2010-10-13Automated merge with ↵Oz Linden
ssh://bitbucket.org/merov_linden/viewer-development-storm-137
2010-10-13correct licenses (fix problem with license change merge)Oz Linden
2010-10-12Allow the passing of addational fmod lib names via FMOD_NAMES from the build ↵Techwolf Lupindo
envorment. This will allow one to pass via command line custom fmod lib names. ie: -DFMOD_NAMES:STRING:"fmod-4.44"
2010-10-12Clean up and rework FMOD.cmake and FindFMOD.cmakeTechwolf Lupindo
FMOD.cmake: Move include(Prebuilt) to prebuilt section. It is only used for prebuilt anyway. set(FMOD_FIND_REQUIRED ON) due to FMOD variable is use elsewhere in cmake files. This behaviour is the same as openal. Remove redudent error messages and code due to above. Rework the logic to be more cleaner. Clean up whitespace. FindFMOD.cmake Remove redudent paths as cmake allready uses them as default. Use PATH_SUFFIXES instead. The above will result in cmake looking in a lot more places and can handle custom build setups better. Change FMOD to FMOD_FOUND. FMOD should not be change withen cmake. Whitespace cleanup.
2010-10-12merged SNOW-756 / VWR-23385 / STORM-374 (fixed standalone LD_LIBRARY_PATH ↵Boroondas Gupte
for unit tests)
2010-10-12SNOW-756 / VWR-23385 FOLLOWUP fixed indentationBoroondas Gupte
2010-10-12SNOW-756 / VWR-23385 FIXED standalone LD_LIBRARY_PATH for unit testsBoroondas Gupte (patch by Aleric Inglewood)
Used patch from https://jira.secondlife.com/secure/attachment/41586/SNOW-756-standalone_tests.diff patching file indra/cmake/LLAddBuildTest.cmake Hunk #1 succeeded at 259 with fuzz 2 (offset 1 line). Added entry in doc/contributions.txt. No further changes. originally commited to Snowglobe 2.1 at http://svn.secondlife.com/trac/linden/changeset/3515
2010-10-07Pull update from viewer-developmentMerov Linden
2010-10-07SH-65 WIP update convex decomp on macNyx Linden
Pushing in the cmake change that will make the mac build use the non-stub version of the convex decomp lib.
2010-10-02STORM-137 : Build script modif so that Windows build does not rely on ↵Merov Linden
fmod.dll being dropped in the source tree + addition to allow fmod to be found in standalone. Caution: wait an upcoming install.xml commit before pulling if building internaly.
2010-10-01disable incremental linking by default as per vir's request.Dave Parks
2010-09-30Switch to 10.5 SDKDave Parks
2010-09-29MergeLeyla Farazha
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-14 20:58:06 +0000