9635923d55
Temporarily work around cygwin /cygdrive/c pathname in AUTOBUILD.
2014-12-22 15:27:28 -05:00
f6abe4a228
Merge backout of forcing DEBUG_PREBUILT setting.
2014-12-19 16:47:06 -05:00
77edde1752
Backed out changeset 4356b6a222c7: forcing DEBUG_PREBUILT output.
...
It appears that our trouble was due to a cygwin-style path in the AUTOBUILD
environment variable, and that changeset 0e0bd8b546ad fixed it.
2014-12-19 16:42:26 -05:00
35d141967a
Defend against cygwin-style AUTOBUILD path in environment.
2014-12-19 15:58:20 -05:00
72aae0db66
Automated merge with ssh://bitbucket.org/lindenlab/viewer-tools-update
2014-12-19 15:37:31 -05:00
651b73368b
Sort include(...) lines to make it easier for a person to verify.
2014-12-19 15:34:12 -05:00
b9be170403
Force DEBUG_PREBUILT on in Prebuilt.cmake to debug failures on TC.
2014-12-19 15:16:13 -05:00
fae23034ad
Automated merge with ssh://bitbucket.org/lindenlab/viewer-tools-update
2014-12-18 18:17:24 -05:00
df5006eac9
Update autobuild to point to new version of jsoncpp and change lib names to match those in package
2014-12-17 19:29:30 -08:00
b265b899d4
Update autobuild to point to new (VS2013) Havok files and fix up name mismatch
2014-12-17 16:24:31 -08:00
6a552963a4
Remove reference to Windows version of GTK/ATK/Pango in autobuild - not used
2014-12-17 14:56:14 -08:00
2385cac566
Move the cmake package tracking files under the packages directory
2014-12-17 16:57:48 -05:00
6bea6bfa45
Delete misleading comment about testing llcapabilitylistener.
...
There was a comment in CMakeLists.txt left over from 2009 (!) about commenting
out the unit test for llcapabilitylistener. Fortunately we've since reinstated
the test as an integration test, but the comment was never removed -- until now.
2014-12-17 14:57:41 -05:00
4666497507
merge up to latest changes from callum and nat
2014-12-17 14:28:58 -05:00
11ecd9a2d9
many package updates (mostly linux)
2014-12-17 13:14:49 -05:00
2714ecea21
adjust cmake not to attempt loads of packages on the wrong platforms
2014-12-17 13:13:41 -05:00
f8ed44f8ec
merge latest updates from nat and callum
2014-12-17 11:15:31 -05:00
0d71baba74
Produce error message, not traceback, when test program doesn't build.
...
A traceback from a Python script always makes people think there's a bug in
your script. Even when a test program fails to build, CMake often (always?)
tries to run it anyway, via our run_build_test.py script. For that case,
produce a straightforward error message -- rather than an OSError traceback
that doesn't even mention the program name!
2014-12-17 11:10:33 -05:00
3b7d3cb1ea
For one use case, boost::bind() better than boost::phoenix::bind().
...
We use boost::phoenix::placeholders::arg1 to imply a whole lambda expression,
replacing boost::lambda. But to bind a plain function in a more
straightforward way, seems classic boost::bind() works while
boost::phoenix::bind() does not.
2014-12-16 15:17:24 -05:00
210c95b283
Remove Visual Studio workaround for lack of std::fpclassify().
...
Visual Studio 2013 evidently does provide std::fpclassify(), so we no longer
need the funky local alias.
2014-12-16 14:03:57 -05:00
6793fa569b
Fix another empty #elif to plain #else.
2014-12-16 13:55:15 -05:00
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
11ab03331f
include quicktime package only on windows
2014-12-15 13:02:12 -05:00
37cd872f40
include libuuid and fontconfig only on linux
2014-12-15 13:00:47 -05:00
062c13364b
don't include glext on Mac where it is not used
2014-12-15 12:57:56 -05:00
9960145ed0
remove redundant include of Audio.cmake
2014-12-15 12:52:26 -05:00
dab5acd972
merge changes for 3.7.22-release
2014-12-15 12:34:18 -05: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
Nat Goodspeed