43d29ea03e
merge changes for DRTVWR-202
2012-08-22 17:11:10 -04:00
848ed9cb2f
Fix up white space to follow coding policy guidelines
2012-08-22 12:58:08 -07:00
63d04204a9
merge changes for DRTVWR-203
2012-08-22 08:46:19 -04:00
3e05f169d6
Minor change required for merge from viewer-development
2012-08-17 09:04:16 -07:00
efdcf045b0
Merged in from viewer-development.
2012-08-17 08:07:15 -07:00
75caf0c916
More optional signing stuff for 10.5
2012-08-08 14:56:51 -07:00
6f1be0007b
Pulled merge, changed . to , in viewer-manifest
2012-08-08 11:36:10 -07:00
3e9c9993e3
More optional config for 10.5 builds
2012-08-08 11:28:19 -07:00
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
bf6bbe4642
MAINT-515 FIX, CHOP-100 FIX - technically we are avoiding these issues rather than fixing them; changing llcommon to be statically linked avoids the symbol issues with llcommon.dll
2012-08-02 11:45:38 -04:00
df93749819
merge up to latest viewer-development
2012-07-31 14:55:15 -04:00
78854c9baa
Fix to build with code signing option (patch from STORM-1900)
2012-07-25 16:42:37 -07:00
ef37311e9e
merge up to latest viewer-pathfinding (including 3.3.4)
2012-07-24 13:11:14 -04:00
8df3619621
merge to viewer-developmento
2012-07-24 10:51:37 -04:00
4feef5af63
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.
2012-07-23 19:21:34 -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
42cc602732
fix finding havok libs in relwithdebinfo mode (uses release unless LL_DEBUG_HAVOK is used
2012-07-21 08:47:36 -07:00
12b1ec6264
refactor to build llphysicsextensions_tpv package for sublicensees
2012-07-20 07:38:12 -07:00
d2e67d0c0b
cmake changes for OSX 10.7
2012-07-18 19:01:19 -07:00
173d0fa213
Pull in viewer-development because it's painful. Merge with runitai's help.
2012-07-11 16:15:23 -07:00
847a2738a3
Changed windows to always use havok Hybrid in RelWithDebInfo. Windows no longer uses Havok Debug. On other platforms, use of Debug vs Fulldebug in RelWithDebInfo is still governed by LL_DEBUG_HAVOK
2012-07-11 14:55:01 -07:00
9fa98e13eb
Hopefully fixed windows build. Now support -DLL_DEBUG_HAVOK:BOOL=ON to enable Havok Hyrbid (fulldebug) libs to link in Windows RelWithDebInfo. On other platforms, that flag will cause RelWithDebInfo to link against Havok fulldebug libs. The rest of the time, RelWithDebInfo will link to Havok Debug and Debug will link to Havok Fulldebug
2012-07-11 03:16:33 +00:00
e80c001e31
Updating Havok.cmake to support all 3 major build configurations on all platforms. This is incomplete and requires additional changes to the 3p-havok-source repo and the llphysicsextensions-src repo.
2012-07-10 18:16:05 -07:00
82f3ee0b3c
experimental - try 10.6 SDK and lvmgcc42 on TeamCity
2012-07-10 09:40:01 -04:00
702e6815ed
partial changes for building with the llphysicsextensions source package
2012-07-05 12:16:48 -04:00
21ee5f8d41
successful build with llphysicsextensions stub
2012-07-05 09:39:21 -04:00
14f754f160
begin integrating building of llphysicsextensions from source here (incomplete)
2012-07-05 06:08:34 -04:00
619e0b9a35
remove some cmake output that is no longer needed
2012-07-03 09:36:38 -04:00
ed72fd0ae9
merge
2012-06-28 13:22:04 -05:00
764d1e3caf
merge up to 3.3.3-release
2012-06-28 10:35:22 -04:00
2c3e78f1f1
merge changes for DRTVWR-167
2012-06-27 14:18:22 -04:00
6e710333e7
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.
2012-06-22 18:59:31 -07:00
ba4c4bcbd1
merge
2012-06-22 15:53:28 -04:00
4397516ca5
merge changes for DRTVWR-168
2012-06-21 17:50:41 -04:00
99dc246ac8
Merge
2012-06-15 14:29:46 -05:00
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
ad745867ed
MAINT-646 Enable /fp:fast in Visual Studio
2012-06-08 14:19:36 -05:00
542975b4c6
merge
2012-06-04 16:19:18 -04:00
f83fcc357f
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.
2012-05-25 18:44:47 -07:00
1d01ad1162
merge changes for DRTVWR-151
2012-05-24 20:35:25 -04:00
1300f77fdd
Merged with viewer-beta
2012-05-20 17:41:00 +02:00
79a24d5d51
merge changes for wolf-318
2012-04-25 19:35:23 -04:00
b18d21486a
Try to suppress spurious Mac ld warnings (lib/release/Release dir).
...
Mindful that some autobuild packages populate only packages/lib/release
(rather than packages/lib/debug), Linking.cmake always appends
packages/lib/release to CMake's link_directories() directive. But since CMake
always appends CMAKE_BUILD_TYPE to those directories, we end up with a phantom
packages/lib/release/Release directory on the search path. This would be
harmless except that the Mac's 'ld' command produces a warning. These warnings
quickly make TC's "Important Messages" output useless. Try appending
packages/lib/release only when the build type isn't already Release.
2012-04-25 17:17:08 -04:00
9b64464d02
more attempts to fix the hunspell lib for Mac
2012-04-25 12:27:34 -04:00
1b832eaa4b
OPEN-54: correct JsonCpp include path
2012-04-24 11:24:11 -04:00
7bcfd3a4ae
fix version number of the libhunspell dylib in another place
2012-04-23 17:27:54 -04:00
e02bf8f90d
add dictionaries to the Hunspell.cmake so that it gets installed
2012-04-23 14:00:25 -04:00
36a0a58487
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-development.
2012-04-03 11:06:33 -07:00
f0c8c4e8fb
For a test program killed by signal, display signal name.
2012-03-12 12:05:18 -04:00
Oz Linden