diff options
| author |  bungeman <bungeman@google.com> | 2015-07-21 14:14:30 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-07-21 14:14:30 -0700 |
| commit | b7069e9c1f65d11f9581be0adbffa968257afc33 (patch) | |
| tree | 81affa184b4364bff0020c8fed2e6a902984bc7c /gyp | |
| parent | 7a787b47437043aacc2d476beab2f531bc02fe9d (diff) | |
Compile with VS2015.
Visual Studio 2015 has additional warnings around noexcept and
disabling exceptions, which can be worked around with the
(undocumented) _HAS_EXCEPTIONS macro.
Visual Studio 2013 and 2015 have roundf in math.h, so use it to
avoid extra work and casts.
We avoid using cmath, as it undefs isfinite on gcc, but Visual Studio
2015 no longer provides overloads of copysign from math.h (which is
actually correct). As a result, use copysignf (which is available in
math.h in 2013 and 2015) directly.
Review URL: https://codereview.chromium.org/1244173005
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/common_conditions.gypi | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi index b088b7a06d..ba4337403d 100644 --- a/gyp/common_conditions.gypi +++ b/gyp/common_conditions.gypi @@ -46,6 +46,7 @@ 'SK_BUILD_FOR_WIN32', '_CRT_SECURE_NO_WARNINGS', 'GR_GL_FUNCTION_TYPE=__stdcall', + '_HAS_EXCEPTIONS=0', ], 'msvs_disabled_warnings': [ 4275, # An exported class was derived from a class that was not exported |