b8d21a0285
Push base sdk back up to 10.8 for Xcode4.5+
2013-09-10 07:59:00 -06:00
58d89cc492
Allow building for OS X 10.7 (Lion) with Xcode 4.5+.
2013-09-10 08:13:00 -05:00
c69f3acef8
Merge LL 3.6.5
2013-09-09 19:07:03 -06:00
7dd91de7c4
Resolve and remove a bunch of CHUI merge comments
2013-08-23 13:45:24 -06:00
966f96f2ad
More defined clang support
2013-10-12 20:57:58 -06:00
034e2c8ee0
Oops, Xcode5 has no 10.7 target out of the box
2013-10-12 11:56:07 -06:00
abd10acb82
Xcode5 target with clang
2013-10-12 11:46:10 -06:00
0addf213ed
Merge with FS tip. First pass.
2013-08-02 00:40:48 +02:00
c5cf25fd5d
Define ND_BUILD64BIT_ARCH when building for 64 bit.
2013-08-01 23:28:15 +02:00
d4640277d0
Merge LL 3.5.3 release.
2013-07-09 16:24:58 -07:00
e1af26eaa2
Disabling build of headless appearance utility
2012-12-20 21:39:33 +00:00
5ea68c69a4
convert to new channel name scheme and remove login_channel build time parameter
2013-02-12 10:50:47 -05:00
d7e90f4160
derive version number from indra/VIEWER_VERSION.txt
2013-02-07 11:56:57 -05:00
27933214f4
Switching to system osmesa library instead of pre-packaged library
2012-10-24 18:19:22 +00:00
98e2488f6f
Fix for headless appearance utility not linking correctly
2012-10-17 23:11:40 +00:00
cc5f8686fe
Speeding up cmake configuration, especially on linux. Re-arranged llrender/llwindow cmake source a bit
2012-10-15 17:36:51 +00:00
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
8977224883
Limiting headless builds to linux
2012-10-04 08:27:13 +00:00
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
c9ab9590aa
Removing server-related cmake cruft. Fixing libGLU warnings on linux.
2012-10-04 03:12:48 +00:00
848ed9cb2f
Fix up white space to follow coding policy guidelines
2012-08-22 12:58:08 -07:00
3e05f169d6
Minor change required for merge from viewer-development
2012-08-17 09:04:16 -07:00
3e9c9993e3
More optional config for 10.5 builds
2012-08-08 11:28:19 -07:00
78854c9baa
Fix to build with code signing option (patch from STORM-1900)
2012-07-25 16:42:37 -07:00
629ae69793
Make build dependent on version of xcode, not version of OSX for DARWIN
2012-07-23 13:09:26 -07:00
5624f03b9c
Changed CMake to work for older and newer versions of OSX
2012-07-23 12:34:02 -07:00
d2e67d0c0b
cmake changes for OSX 10.7
2012-07-18 19:01:19 -07:00
6425b3cd65
Merge RLVa SSB update
2013-02-24 18:24:48 -08:00
6207030884
Merge FS LGPL tip
2013-02-23 17:09:53 -08:00
2c9e821188
Rename HAS_OPENSIM_SUPPORT switch to OPENSIM
2013-02-18 21:24:20 -07:00
ea86bb88c3
first pass merge
2013-02-04 10:52:32 -08:00
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
e19bf117e4
Disable OpenSim support when compiling with Havok.
2012-10-31 01:15:36 +01:00
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
8a92612fd9
merge
2011-05-16 12:34:15 -05:00
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
a25f898703
merge
2011-05-02 14:52:12 -05:00
0656620e2d
merge changes for storm-1187
2011-04-22 11:49:41 -04:00
19857d0cf0
merge
2011-04-21 16:23:00 -05:00
8d2943c5dd
Fixed debug information format for mac to allow breakpoints to work under Xcode.
2011-04-18 14:08:29 -07:00
8f0d59cab3
OPEN-50 (partial): refactor cmake switches to common configurations and default values
2011-04-06 05:46:45 -04:00
47781184fc
Automated merge up from viewer-development into mesh-development
2011-04-04 10:42:52 -04:00
d0ba2bc847
pull latest changes from viewer-development
2011-04-01 09:52:37 -04:00
44ad672b9e
Apply server side code to message template verification onto the viewer tree.
2011-03-31 15:43:47 -07:00
faecf0fe9a
for now, turn off precompiled header usage by default (so Incredibuild will work).
2011-02-16 15:56:31 -08:00
b7637e58be
mac buiding with autobuild and autobuild style packages (just say no to install.py)
2011-01-13 13:09:27 -08:00
d8695e8d65
Use 10.5 sdk for now
2010-12-09 18:09:35 -08:00
27b2ec552d
Switch default platform SDK to 10.6
2010-12-03 02:38:57 -06:00
09a9e61c34
SH-392 Port over fix from mesh-development for FBOs on OSX
2010-11-04 16:33:16 -04:00
630ee695f2
Don't override the channel specified by the build.
2011-09-06 23:25:21 -04:00
8d9fba43b9
Firestorm merge catchup
2011-08-27 06:00:46 -04:00
8de8a5f1cf
Merge with RLVa 2.8, part 1
...
Known issues:
- RLV Debug method commented out
- RLV Windlight options not implemented
2011-08-27 01:21:37 -04:00
9fd0edb326
Initial 2.8.3+ merge, Tozh & Arrehn
...
Issues: Graphics preferences tab, lighting, depth of field
Issues: Color preferences tab, new direct chat
Issues: Build floater Mesh build tab
Issues: German translations of build, viewer menus
Issues: pipeline issues with mac, possibly other things
Issues: uploading content / temp content
Issues: Windlight quickprefs, parcel windlight, RLVa windlight
2011-08-26 11:18:49 -04:00
5f80dbef9e
FS Autobuild improvements: support for RelWithDebInfoFS_open, LL-style config options, more documentation
2011-08-19 20:48:34 -04:00
e23b163acf
MacOSX Lion build compatibility & adjustments, adapted from Mimika Oh
2011-08-14 12:08:44 -04:00
e277b8a4ac
Merge with LL 2.6.9, initial work. Needs tests, extra XUI merging with particular skins.
2011-08-04 11:53:40 -04:00
2cc50e9684
Credits for Upload-to-Flickr commit: Original code from Katharine Berry, perm to license LGPL given. Patch contributed by Alexie Birman FIRE-589
...
Turtoise HG auto commited this under Alexie's name, however it was commited to the repo by myself.
2011-04-16 12:26:23 -04:00
d7cbb706dc
Changed flickr api key to Phoenix-Firestorm API
2011-04-16 12:12:32 -04:00
882c80b778
Upload-to-Flickr
2011-04-10 15:23:44 +01:00
7a68e8ff11
Turn off LL_TESTS by default
2011-01-08 00:40:21 -08:00
aeaf4c5651
Updated macosx build control for channels
2010-11-13 13:46:32 -05:00
829b22b1e4
Merge from LL
2010-11-05 12:17:05 -07:00
90c2c4a9bc
SH-392 Port over fix from mesh-development for FBOs on OSX
2010-10-27 16:19:18 -05:00
f66c9b183b
branding (win)
2010-10-23 12:49:10 -04:00
348d15f836
Phoenix branding, part 1, macintosh build
2010-10-19 23:31:37 -04:00
845f004932
disable incremental linking by default as per vir's request.
2010-10-01 13:32:30 -05:00
3ee62f7d73
Switch to 10.5 SDK
2010-09-30 00:48:00 -05:00
7c2b9221d6
merge
2010-09-27 15:20:27 -05:00
90e3d83a5c
Fix for build failures - disabling tcmalloc for now
2010-09-21 13:26:52 -04:00
bd3d9e1ba9
VWR-20911 FOLLOWUP fixed indentation (cmake files use spaces only)
...
(transplanted from d02b22278d5b0a0386b3a7c25221b2069bc02963)
2010-08-31 14:41:46 +02:00
136858bd20
VWR-20911 FIXED CMake build arch detection is inaccurate and incomplete
...
Robin Cornelius' patch from
http://jira.secondlife.com/secure/attachment/42801/SNOW-776+Don%27t+use+uname+for+build+arch+detection%2C+use+compiler.patch
applied without fuzz:
patching file indra/cmake/Variables.cmake
Hunk #1 succeeded at 52 (offset -2 lines).
Added entry in doc/contributions.txt.
No further changes other than that.
(transplanted from a9132a63e4739965d65ddd58a7be9eabe4321c2a)
2010-08-31 12:16:03 +02:00
761b346e8d
Turning off universal builds
2010-05-07 16:32:29 -07:00
4539690173
revert mac build to 10.4u sdk. remove FBO code from llrendertarget.cpp with #ifdefs.
2010-05-07 17:43:12 -05:00
809b6879e1
Use 10.5 sdk
2010-04-26 17:35:52 -05:00
437d23710f
EXT-7004 : Select GCC 4.0 automatically as the compiler in Xcode with Cmake 2.8.1
...
GCC 4.0 will be selected as the compiler in Xcode if building against the OS X 10.4 SDK which is incompatible with GCC 4.2
Also made it possible to override the selected SDK from the configure line, by using something like:
-DCMAKE_OSX_DEPLOYMENT_TARGET:STRING='10.4' -DCMAKE_OSX_SYSROOT:PATH='/Developer/SDKs/MacOSX10.5.sdk'
Reviewed by: Poppy.
2010-04-22 16:09:54 +01:00
67f11add9c
Added a USE_PRECOMPILED_HEADER cmake variable (defaulted on) and disabled pch usage for test executables. Reviewed by james and steve.
2009-11-13 20:30:54 -05:00
3858992603
Add CMake var LL_TESTS to optionally disable tests for build timing
2009-11-27 22:24:57 -08:00
9ec432034d
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
...
ignore-dead-branch
2009-06-21 08:04:56 +00:00
af91e85531
Small braino
2009-06-02 17:25:54 +00:00
4bcbf33422
svn merge -r118008:118374 svn+ssh://svn.lindenlab.com/svn/linden/branches/cg/viewer-etch-1
...
QAR-1459 etch builds enabled
2009-04-30 06:52:38 +00:00
664f27380c
merge -r116796:116932 svn+ssh://svn.lindenlab.com/svn/linden/branches/http-texture/http-texture-10
...
DEV-8668 (llkdu) DEV-30348 (set development default channel to LindenDeveloper)
2009-04-13 21:03:44 +00:00
c7c34d9ad2
Working around DEV-30401 by yanking the etch 32bit build code until the viewer also builds on etch
2009-04-10 01:14:30 +00:00
1aca3ff6f5
Get 32-bit builds going on 64-bit Debian Etch.
...
Reviewed by Brad.
2009-04-09 18:05:56 +00:00
b27e0e08f0
Add code to support add_viewer_version_to_manager
2008-07-15 01:34:41 +00:00
144aeb56ca
Add support for GRID:STRING in cmake
2008-07-07 21:57:50 +00:00
1d12a5c20a
DEV-17460 updated the cmake SERVER variable init to work reliably
2008-07-03 21:10:36 +00:00
d32c8825b6
svn merge -r89701:90677 svn+ssh://svn/svn/linden/branches/install-dev-binaries/s3-build -> release
2008-06-26 19:08:51 +00:00
4e19c91811
whoops - one line, nay, one *word* fix to my mac universal patch. Reviewed by cg
2008-06-17 19:31:12 +00:00
916f9af25c
"mac cmake build should not be universal by default" changes. Reviewed by bos.
2008-06-16 09:21:51 +00:00
9db949eec3
svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge
...
dataserver-is-deprecated
for-fucks-sake-whats-with-these-commit-markers
2008-06-02 21:14:31 +00:00
Cinders