summaryrefslogtreecommitdiff
path: root/indra/cmake
AgeCommit message (Collapse)Author
2016-11-16DRTVWR-418: pull in new viewer-release via viewer64Nat Goodspeed
2016-11-16Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseNat Goodspeed
2016-11-15DRTVWR-418: Mistakenly inverted the sense of the LL_64BIT_BUILD test.Nat Goodspeed
2016-11-15DRTVWR-418: Fold windows64 into windows platform with new autobuild.Nat Goodspeed
autobuild 1.1 now supports expanding $variables within a config file -- support that was explicitly added to address this very problem. So now the windows platform in autobuild.xml uses $AUTOBUILD_ADDRSIZE, $AUTOBUILD_WIN_VSPLATFORM and $AUTOBUILD_WIN_CMAKE_GEN, which should handle most of the deltas between the windows platform and windows64. This permits removing the windows64 platform definition from autobuild.xml. The one remaining delta between the windows64 and windows platform definitions was -DLL_64BIT_BUILD=TRUE. But we can handle that instead by checking ADDRESS_SIZE. Change all existing references to WORD_SIZE to ADDRESS_SIZE instead, and set ADDRESS_SIZE to $AUTOBUILD_ADDRSIZE. Change the one existing LL_64BIT_BUILD reference to test (ADDRESS_SIZE EQUAL 64) instead.
2016-11-03Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseNat Goodspeed
2016-10-10Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2016-09-20Small improvements to UI DPI scaling on Windows:Ansariel
* Use USER_DEFAULT_SCREEN_DPI define from WinUser.h * Change Win32 SDK target version to Windows Vista or greater * Define WM_DPICHANGED as preprocessor definition as in WinUser.h * Cull manual definitions of WM_MOUSEWHEEL and WHEEL_DELTA which are part of the Win32 SDK since Windows NT 4.0
2016-06-29merge changes for buildscriptsOz Linden
2016-06-09move build number informative output to stdoutOz Linden
2016-06-01Linux: Use media_plugin_libvlc for media playback.Nicky
2016-06-01Linux: SDL has a dependency on X11 -> Link against it.Nicky
2016-05-26Put back QuickTime plugin code for OS X only (untested - moving code to OS X ↵callum_linden
dev)
2016-05-23Automated merge with tip of viewer-releasecallum_linden
2016-05-19Automated merge with tip of viewer-release to pick up 4.0.5callum_linden
2016-05-13Additional set of changes to use vlc-bin packagecallum_linden
2016-05-06Moving to a private repocallum_linden
2016-04-24Windows z64: Disable warning 4267 via llpreprocessor rather than cmake filesNicky
(transplanted from 165fa5852652a1da005cf3b2201c192f028efd43)
2016-04-22DRTVWR-418 Remove references to gtk-atk-pango-glib from Windows build since ↵callum_linden
it's not used there
2016-04-22Windows x64: Disable warning 4267 (it causes too much noise) and do not ↵Nicky
enable /arch:SSE2 (x64 implies SSE2 and setting the flag causes warnings). (transplanted from 5a7cc3874065b13a83b8c7aa044fb07f38edd283)
2016-04-21DRTVWR-418 remove vestiges of TCMALLOC and GooglePerfTools from the viewercallum_linden
2016-04-21DRTVWR-418 remove references to some misc files I missedcallum_linden
2016-04-21DRTVWR-418 remove references (and files) for QuickTimecallum_linden
2016-04-19Remove references to quicktime from the plain old viewer-release buildcallum_linden
2016-04-04merge with 4.0.3-releaseOz Linden
2016-03-22correct exception thrown for unknown systemOz Linden
2016-02-07OPEN-297 simplify build number generationOz Linden
2016-02-07merge changes for OPEN-292Oz Linden
2016-02-04add build configuration to the About box if it is not ReleaseOz Linden
remove some superfluous other information from About
2016-01-15merge changes for 4.0.1-releaseOz Linden
2015-12-21CMake fixes for Linux buildRider Linden
2015-12-18Another rt link for linuxRider Linden
2015-12-18MergeRider Linden
2015-12-18Disable unit test on Linux onlyRider Linden
2015-12-18MergeRider Linden
2015-12-18Reorder the rt library for Linux buildRider Linden
2015-12-17MAINT-5977: Update cmake file to always include boost with LLCommonRider Linden
2015-11-29Merged lindenlab/viewer-tools-update into defaultCinder Biscuits
2015-11-23Merge from Vivox RepoRider Linden
2015-11-13MAINT-5862 Fix Provide a way for new Linux users to accept ToScallum_linden
2015-11-10remove execute permission from many files that should not have itOz Linden
2015-10-06merged changes from viewer-xcode-7Bjoseph Wombat
2015-10-06merge changes for XCODE-7Oz Linden
2015-10-02MAINT-5687: Remove old webkit from the make files and the repo. Ensure that ↵Rider Linden
it is no longer meaningfully referenced.
2015-10-01Merge for Xcode 7rider
2015-09-29Merge with viewer-xcode-7 for Xcode 7 patchescallum_linden
2015-09-23Remove ares dependency from build.Rider Linden
2015-09-18Turn off (for now) the warnings/errors that result from Boost.Units usagecallum_linden
2015-09-18Update version of Xcode (7.0) and SDKs (10.11)callum_linden
2015-08-25Reenable and correct link issue on linux llappearanceutility.Rider Linden
2015-08-20Remove forgotten parenRider Linden