Commit Graph

101 Commits (d0a51da8942c1908ecad3f718cf620dafd96c511)

Author SHA1 Message Date
Cinders c844caf13c Get rid of ppc nonsense again 2013-12-13 23:41:58 -07:00
Nicky 49133a28f2 Take missing code snippets from viewer-release for Variables.cmake/Darwin. 2013-12-13 23:39:38 +01:00
Nicky ed4c40a7ab Merge with -lgpl 2013-10-14 20:57:33 +02:00
Nicky 329ca38457 Merge with -lgpl. 2013-09-14 23:23:26 +02:00
Cinders b8d21a0285 Push base sdk back up to 10.8 for Xcode4.5+ 2013-09-10 07:59:00 -06:00
Tonya Souther 58d89cc492 Allow building for OS X 10.7 (Lion) with Xcode 4.5+. 2013-09-10 08:13:00 -05:00
Cinders c69f3acef8 Merge LL 3.6.5 2013-09-09 19:07:03 -06:00
Cinders 7dd91de7c4 Resolve and remove a bunch of CHUI merge comments 2013-08-23 13:45:24 -06:00
Cinders 966f96f2ad More defined clang support 2013-10-12 20:57:58 -06:00
Cinders 034e2c8ee0 Oops, Xcode5 has no 10.7 target out of the box 2013-10-12 11:56:07 -06:00
Cinders abd10acb82 Xcode5 target with clang 2013-10-12 11:46:10 -06:00
Nicky 0addf213ed Merge with FS tip. First pass. 2013-08-02 00:40:48 +02:00
Nicky c5cf25fd5d Define ND_BUILD64BIT_ARCH when building for 64 bit. 2013-08-01 23:28:15 +02:00
Geenz 72159fd03e The viewer now requires the 10.7 SDK or above to compile. 2013-06-17 18:18:37 -04:00
Geenz 3779e51bfc Merged with https://bitbucket.org/lindenlab/viewer-beta 2013-05-13 22:22:51 -04:00
Oz Linden 3bb708d706 merge up to latest viewer-development for merge to 3.5.2 2013-04-19 14:42:56 -04:00
Oz Linden ddd5659f81 merge changes for DRTVWR-294 2013-04-19 10:11:29 -04:00
Oz Linden 327c99cadb merge up to 3.5.2 development 2013-04-16 16:01:32 -04:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Graham Madarasz (Graham Linden) 98e02a5d76 Merge new boost and add OS X 10.8 mods 2013-02-22 09:49:58 -08:00
Tank_Master d4640277d0 Merge LL 3.5.3 release. 2013-07-09 16:24:58 -07:00
Don Kjer e1af26eaa2 Disabling build of headless appearance utility 2012-12-20 21:39:33 +00:00
Oz Linden 5ea68c69a4 convert to new channel name scheme and remove login_channel build time parameter 2013-02-12 10:50:47 -05:00
Oz Linden d7e90f4160 derive version number from indra/VIEWER_VERSION.txt 2013-02-07 11:56:57 -05:00
Don Kjer 27933214f4 Switching to system osmesa library instead of pre-packaged library 2012-10-24 18:19:22 +00:00
Don Kjer 98e2488f6f Fix for headless appearance utility not linking correctly 2012-10-17 23:11:40 +00: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 e60491fc69 Adding multi-arch hints to CMake, allowing it to correctly find libraries on multi-arch debian-based systems. 2012-10-11 20:10:11 +00:00
Don Kjer 8977224883 Limiting headless builds to linux 2012-10-04 08:27:13 +00:00
Don Kjer 21df924a10 Building headless and non-headless libraries side-by-side, removing the need for the BAKING cmake setting. 2012-10-04 06:29:07 +00:00
Don Kjer c9ab9590aa Removing server-related cmake cruft. Fixing libGLU warnings on linux. 2012-10-04 03:12:48 +00:00
callum_linden 848ed9cb2f Fix up white space to follow coding policy guidelines 2012-08-22 12:58:08 -07:00
Aura Linden 3e05f169d6 Minor change required for merge from viewer-development 2012-08-17 09:04:16 -07:00
Aura Linden 3e9c9993e3 More optional config for 10.5 builds 2012-08-08 11:28:19 -07:00
callum_linden 78854c9baa Fix to build with code signing option (patch from STORM-1900) 2012-07-25 16:42:37 -07:00
Aura Linden 629ae69793 Make build dependent on version of xcode, not version of OSX for DARWIN 2012-07-23 13:09:26 -07:00
Aura Linden 5624f03b9c Changed CMake to work for older and newer versions of OSX 2012-07-23 12:34:02 -07:00
Aura Linden d2e67d0c0b cmake changes for OSX 10.7 2012-07-18 19:01:19 -07:00
Tank_Master 6425b3cd65 Merge RLVa SSB update 2013-02-24 18:24:48 -08:00
Tank_Master 6207030884 Merge FS LGPL tip 2013-02-23 17:09:53 -08:00
Cinders 2c9e821188 Rename HAS_OPENSIM_SUPPORT switch to OPENSIM 2013-02-18 21:24:20 -07:00
Tank_Master ea86bb88c3 first pass merge 2013-02-04 10:52:32 -08:00
Tank_Master 5b5f4c8bf5 Merge LL 3.4.2 release,
broken revision, KDU package needs updating, mac packager also likely broken
2012-12-14 07:59:55 -08:00
Nicky e19bf117e4 Disable OpenSim support when compiling with Havok. 2012-10-31 01:15:36 +01:00
Leslie Linden b530648dd4 EXP-869 FIX -- Mac viewer should build without requiring settings modifications
Modified cmake GCC_VERSION from 4.2 to 4.0, our officially supported GCC version

Reviewed by Richard
2011-06-01 11:46:53 -07:00
Dave Parks 8a92612fd9 merge 2011-05-16 12:34:15 -05:00
brad kittenbrink a8ba89eb41 Fix for CHOP-619. Found a general solution to our vs2010 precompiled headers problems and eliminated all our special cases for handling them. 2011-05-03 18:15:00 -07:00
Dave Parks a25f898703 merge 2011-05-02 14:52:12 -05:00
Oz Linden 0656620e2d merge changes for storm-1187 2011-04-22 11:49:41 -04:00
Dave Parks 19857d0cf0 merge 2011-04-21 16:23:00 -05:00