1bd8a67dcb
Isolate #pragma clang to __clang__ compilations.
...
It's very irritating that Visual Studio produces a warning for unrecognized
#pragmas, which we then merrily turn into an error -- #pragma is inherently
compiler-specific!
2014-12-16 13:54:29 -05:00
f884c008d5
fix for some std::pair/STL syntax
2014-12-15 13:35:03 -08:00
d23803c74e
Merge with head
2014-12-15 10:10:38 -08:00
71c70117dd
Add feature (enabled) to turn off media plugins
2014-12-15 10:10:18 -08:00
c43b176584
Remove unneeded media plugin header file
2014-12-12 17:43:09 -08:00
bbd6d8dc0e
Implicit conversion from ostream to string needs help in VS2013
2014-12-12 17:42:16 -08:00
eb5c0dd32a
merge latest fix from nat
2014-12-12 18:21:37 -05:00
f7d1ece5be
Make JsonCpp.cmake reference Windows lib names we actually use.
2014-12-12 17:33:24 -05:00
282d8c4c45
merge dictionary change
2014-12-12 17:27:50 -05:00
e6a7ce08ed
fix dos line endings
2014-12-12 17:21:24 -05:00
eae38f7d57
Eliminate use of boost::lambda with boost::function (Trac #10864 ).
...
https://svn.boost.org/trac/boost/ticket/10864
I've used boost::lambda with boost::function in a number of creative ways over
the years. But the clang 6 shipped with Xcode 6 seems to have somehow broken
lambda + function in Boost 1.57. boost::phoenix is a partial workaround.
Sadly, lambda's comma-operator overload doesn't seem to be supported,
necessitating a couple ugly workarounds.
With real lambdas now supported by current compilers, I'm sure the Boost
community has little incentive to repair the lambda + function problem.
Presumably we'll be able to use such features ourselves Real Soon Now...
2014-12-12 13:46:41 -08:00
7282d29bf8
Make LINE_NUMBER_HERE workaround conditional on LL_WINDOWS.
...
The referencing code is all within LL_WINDOWS conditionals, so the dummy
variable must be enclosed that way too -- otherwise we get
unreferenced-variable warnings-as-errors on other platforms.
2014-12-12 13:39:57 -08:00
727adc994f
Automated merge with ssh://bitbucket.org/lindenlab/viewer-tools-update
2014-12-12 14:33:42 -05:00
20de60576f
Wrap call to autobuild in some diagnostic code.
...
Hopefully this will make certain errors clearer, notably failure to launch
autobuild due to "cannot find the file specified".
2014-12-12 14:33:20 -05:00
4c597c548f
Fix up remaining llround() -> ll_round() issues
2014-12-12 11:03:56 -08:00
ea5c856335
Merge with head
2014-12-12 09:31:01 -08:00
97eb74adc2
Update VSTool that is used to set configuration in MSVC solution file for MSVC 2013 (v12.x)
2014-12-12 09:30:33 -08:00
ddf0f7a915
Another round of ll_round()
2014-12-12 08:54:34 -08:00
711e3b6e4e
Automated merge with http://bitbucket.org/lindenlab/viewer-tools-update
2014-12-12 08:45:45 -08:00
659a8fa0bb
Update viewer to consume googlemock build 297460.
2014-12-12 11:41:13 -05:00
998963cc37
Automated merge with ssh://bitbucket.org/lindenlab/viewer-tools-update
2014-12-11 20:03:22 -05:00
7ddca3476f
Update viewer to consume colladadom build 297450
2014-12-11 20:02:55 -05:00
b66389c02e
Re-add missing variable declaration (not that it's very useful and no idea how it was removed)
2014-12-11 16:43:48 -08:00
f81c5a4e94
Add bespoke ctor/dtor that align on 16byte boundaries when creating things on the heap
2014-12-11 16:32:13 -08:00
9b453b2f29
Update viewer to consume boost build 297445 (no fchmodat())
2014-12-11 19:09:11 -05:00
115cd1d4e6
Fix a couple more ll_round() calls
2014-12-11 13:30:25 -08:00
a2bb483f2d
Disambiguate a few ensure() calls.
...
These were of the form ensure(std::string, something convertible to bool). Not
sure what the ambiguity was, but ensure(std::string, bool(something)) works
better.
2014-12-11 13:12:20 -05:00
c56036a8cb
Add /SAFESEH:NO /NODEFAULTLIB:LIBCMT to viewer linker switches.
...
zlib cannot be linked with SAFESEH, which is the VS 2013 default, so every
consumer must set /SAFESEH:NO.
/NODEFAULTLIB:LIBCMT seems to eliminate many duplicate-symbol link errors.
2014-12-11 12:13:07 -05:00
34009fc88f
merge with head
2014-12-10 15:17:42 -08:00
8c347a4832
Match up our usage of MS APIs with function prototypes in the new version of the API
2014-12-10 15:17:20 -08:00
f9305e06e0
Automated merge with ssh://bitbucket.org/lindenlab/viewer-tools-update
2014-12-10 16:22:40 -05:00
8befaedb8b
Update autobuild.xml with current builds from Tools Update spreadsheet.
...
This is mostly Mac and Linux, given rev 6cf8a8cd07c6, save for glui, jsoncpp
and llphysicsextensions_source, which also update Windows.
2014-12-10 16:22:18 -05:00
2ebc3b0fb0
Merge with head
2014-12-10 13:02:59 -08:00
6bb3fc9392
Fix for incorrectly formatted #if statements (worked on clang FWIW!)
2014-12-10 13:02:36 -08:00
145153bbb2
Automated merge with http://bitbucket.org/lindenlab/viewer-tools-update
2014-12-10 11:16:42 -08:00
d74d8ff7c5
Replace boost::lambda::_1 with boost::phoenix::placeholders::arg1.
...
Apparently in Boost 1.57 with Xcode 6, the combination of Boost.Lambda and
Boost.Function is broken -- Trac ticket 10864:
https://svn.boost.org/trac/boost/ticket/10864
However, Boost.Phoenix provides an acceptable replacement.
2014-12-10 11:15:56 -08:00
0f1cf6e405
Clarify for VS 2013 that an operator bool() method returns bool.
...
For some reason VS 2013 (unlike its predecessors and other current compilers)
needs us to explicitly convert an operator bool() method's return expression
to bool. :-P
2014-12-10 12:20:33 -05:00
3d94afafb5
Fix for build problems with LLTrace::AccumulatorBuffer copy ctor in VS2013 (only)
2014-12-10 08:56:13 -08:00
23711c9275
Rename llround(..) to ll_round(..) because of a collision with MS llround (long long round) in VS2013
2014-12-10 08:44:08 -08:00
6ad2b5f8d3
merge with head
2014-12-09 17:29:41 -08:00
0b1259a084
no implicit conversion from ofsteam to bool in VS2013!!!!
2014-12-09 17:29:07 -08:00
3c5f97ad5e
update dictionaries to a single common platform build
2014-12-09 12:03:37 -05:00
c46c863d99
Made merge to correct version of file.
2014-12-09 08:11:12 -08:00
5e2d5cc2e1
Merged.
2014-12-08 23:13:19 -08:00
161494cf3d
Pointed to newest havok repos.
2014-12-08 23:07:57 -08:00
0524a4048b
Update autobuild to point to new (Windows) third poarty libraries we just built and configure for VS2013
2014-12-08 16:32:51 -08:00
06760492bd
Update viewer to consume mesa build 297283.
2014-12-06 07:57:05 -05:00
c54d102c8f
Wrap #pragma clang in #if __clang__, else VS produces fatal warnings.
2014-12-05 08:48:10 -05:00
cfbc982b40
Update viewer to consume tut build 297257.
2014-12-05 08:12:13 -05:00
2a3b58b0c4
Place Windows build artifacts in build-vc120 rather than build-vc100.
2014-12-04 21:50:02 -05:00
Nat Goodspeed