Commit Graph

114 Commits (680194deaf7a35caaa629abc16e886d71baff636)

Author SHA1 Message Date
callum_linden 5bef95e86d Update to build on Xcode 6.0: remove final, unwanted warning 2014-10-21 10:08:38 -07:00
callum_linden 5234730779 Update to build on Xcode 6.0: Remove concept of XCODE_VERSION from CMake files - we standardize on Xcode 6 2014-10-20 15:04:45 -07:00
callum_linden 577a3973ea Update to build on Xcode 6.0: Large (and final) collection of fixes for unused variables, unused const-variables, unused member variables & functions etc. Also removed flags from CMake 2014-10-20 14:00:39 -07:00
callum_linden aca7976b87 Update to build on Xcode 6.0: turn BACK ON warnings as errors for overloaded virtuals [-Woverloaded-virtual] and fix up first (of many) files 2014-10-17 13:05:04 -07:00
callum_linden 5ab3a832d3 Update to build on Xcode 6.0: turn OFF warnings as errors for overloaded virtuals [-Wno-overloaded-virtual] 2014-10-17 12:35:26 -07:00
callum_linden 512b166d54 Update to build on Xcode 6.0: first pass at CMake changes to get a build started 2014-10-17 11:44:45 -07:00
Monty Brandenberg 29bea5a6b9 Merge. Refresh from viewer-release after 3.7.11 release. 2014-07-08 17:29:48 -04:00
Monty Brandenberg 98ecd04436 Win: Get running on Windows. Remove DOM_DYNAMIC, link with libxml2_a.lib.
Release and Debug builds working.  Remove the DOM_DYNAMIC define so
that we don't create declspec declarations to colladadom objects
and pull in libxml2_a (_a for archive) to complete the link.  Debug
functional and would be moreso if not for all the CrtCheckMemory()
calls.
2014-05-28 19:10:26 -04:00
Oz Linden a98b4b6bee merge changes for 3.7.7-release 2014-05-07 11:09:04 -04:00
Oz Linden 5870788f68 catch a few more cases of STANDALONE -> USESYSTEMLIBS 2014-04-22 16:08:13 -04:00
Oz Linden 776aadf4ef OPEN-199: replace the confusing STANDALONE switch with USESYSTEMLIBS 2014-03-19 17:30:07 -04:00
Richard Linden 80dfbbaacd merge from viewer-release 2013-10-08 11:59:24 -07:00
Graham Linden 2a03e8f9fb MAINT-3172 fix rendering regressions from release mergedown 2013-09-20 16:44:39 -07:00
Richard Linden 0a96b47663 merge with viewer-release 2013-06-05 19:05:43 -07:00
simon ee2fce8790 Merge downstream code and viewer-beta 2013-05-09 14:10:45 -07:00
Oz Linden 545e033d1e merge changes for DRTVWR-299 2013-05-07 15:11:55 -04:00
Oz Linden ddd5659f81 merge changes for DRTVWR-294 2013-04-19 10:11:29 -04:00
simon b42b789723 Merge in downstream code (chui fixes, materials) 2013-04-11 16:18:34 -07:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Graham Madarasz e8b8a12b73 Mods to make compile on gcc 4.6.3 work mo betta 2013-03-12 10:48:05 -07:00
graham linden e950425fe3 Merged lindenlab/viewer-cat into default 2013-03-12 11:28:07 -07:00
Graham Madarasz (Graham Linden) 35383790fb Merge pragma warning hack to fix linux build 2013-03-12 04:40:51 -07:00
Graham Madarasz (Graham Linden) 2874ecea4d Fix -Wno-uninitialized disable 2013-03-12 07:47:36 -07:00
Graham Madarasz (Graham Linden) a7203a7908 CMake hack to work around gcc-4.1 lack of pragma warning disable processing. 2013-03-12 07:22:11 -07:00
Nat Goodspeed 54e2d2b000 MAINT-2389: Change viewer to Boost package without ucontext.h.
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-21 01:13:24 -05:00
Andrew Meadows 7b0762984a removed compiler flag not understood by OS X version of gcc 2013-01-10 08:54:38 +00:00
Andrew Meadows 019836a396 More fixes for linux build of lltrace changes 2013-01-04 03:02:54 +00:00
Don Kjer 5798dd54cc Fix for building on case-sensitive mac filesystems. Fix to remove unwind spam warnings while linking on xcode 4.5.2 builds 2012-12-11 13:56:50 -08:00
prep e0432f98ee SH-3563. Pull and merge from viewer-development. Modest code changes to fix alignment issue in llAppearance. 2012-11-28 16:36:34 -05:00
Richard Linden c0224cc47a merge with viewer-development 2012-11-19 19:06:36 -08:00
Richard Linden c136b43214 SH-3406 WIP convert fast timers to lltrace system
eliminated min and max macros from windows.h
got rest of viewer to compile against llfasttimer changes
2012-11-15 19:46:09 -08:00
Don Kjer cc5f8686fe Speeding up cmake configuration, especially on linux. Re-arranged llrender/llwindow cmake source a bit 2012-10-15 17:36:51 +00:00
Don Kjer c9ab9590aa Removing server-related cmake cruft. Fixing libGLU warnings on linux. 2012-10-04 03:12:48 +00:00
Oz Linden 1a872c7bf8 pull back changes from 3.4.1-beta11 2012-10-30 14:34:05 -04:00
Oz Linden 5d20dc4782 merge changes for DRTVWR-235 2012-10-30 10:32:27 -04:00
Don Kjer 486f80aae6 Removing build.sh darwin symbols hack. Adding '-g' to both CFLAGS and CXXFLAG to have cmake generation debug symbols in xcode. 2012-10-20 19:47:36 +00:00
Don Kjer 4936ce7782 Removing -g flag from mac builds 2012-10-18 16:23:31 -07:00
Don Kjer 5bf755ba01 Adding '-g' to mac builds 2012-10-17 17:11:13 -07:00
Dave Parks 6d5381d012 reapply 4a8388c13e56: MAINT-646 Enable /fp:fast in Visual Studio 2012-09-20 09:56:37 -04:00
William Todd Stinson a766e26db4 Backing out the changes contributing to DRTVWR-167 and DRTVWR-179 from the repository. 2012-09-10 10:37:02 -07:00
Oz Linden 43d29ea03e merge changes for DRTVWR-202 2012-08-22 17:11:10 -04:00
Aura Linden 75caf0c916 More optional signing stuff for 10.5 2012-08-08 14:56:51 -07:00
callumprentice 9f2b86203a Removed (unworking) code signing parameters from autobuild (wrong place)
Added them to correct place (Cmake config)
2012-08-06 13:40:44 -07:00
Oz Linden df93749819 merge up to latest viewer-development 2012-07-31 14:55:15 -04:00
Tank_Master 6c1196d052 Enable /LARGEADDRESSAWARE compiler flag for windows compiling
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
2012-06-12 09:02:47 -07:00
Dave Parks ad745867ed MAINT-646 Enable /fp:fast in Visual Studio 2012-06-08 14:19:36 -05:00
Richard Linden d089e6c264 bumped up MSVC warning level to 3 to catch more stuff that gcc catches 2011-11-28 19:16:49 -08:00
Boroondas Gupte 0710fea048 merged OPEN-99: use -march=pentium* for 32-bit builds only 2011-06-21 00:20:03 +02:00
Boroondas Gupte a28a53fcf8 merged OPEN-99: use -march=pentium* for 32-bit builds only 2011-06-21 00:17:59 +02:00
Boroondas Gupte 541389b698 merged OPEN-99: use -march=pentium3 for 32-bit builds only 2011-06-21 00:14:28 +02:00