From 6bca9e967afbb956bd6975b57d42886b11a6e609 Mon Sep 17 00:00:00 2001 From: Franz Beaune Date: Wed, 14 Dec 2016 09:18:11 +0100 Subject: [PATCH] Fix VS 2012 build --- src/appleseed/renderer/modeling/light/sunlight.cpp | 2 +- src/cmake/config/win-vs.txt | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/appleseed/renderer/modeling/light/sunlight.cpp b/src/appleseed/renderer/modeling/light/sunlight.cpp index 7b92f2f643..55ecece208 100644 --- a/src/appleseed/renderer/modeling/light/sunlight.cpp +++ b/src/appleseed/renderer/modeling/light/sunlight.cpp @@ -78,7 +78,7 @@ namespace const char* Model = "sun_light"; // The smallest valid turbidity value. - const double BaseTurbidity = 2.0; + const float BaseTurbidity = 2.0f; // Solid angle sustained by the Sun, as seen from Earth (in steradians). // Reference: http://en.wikipedia.org/wiki/Solid_angle#Sun_and_Moon diff --git a/src/cmake/config/win-vs.txt b/src/cmake/config/win-vs.txt index 8eab496337..72f7642289 100644 --- a/src/cmake/config/win-vs.txt +++ b/src/cmake/config/win-vs.txt @@ -86,11 +86,12 @@ if (WARNINGS_AS_ERRORS) ) endif () set (cxx_compiler_flags_common + /wd4068 # Disable warning C4068: unknown pragma + /wd4091 # Disable warning C4091: 'typedef' : ignored on left of X when no variable is declared /wd4290 # Disable warning C4290: C++ exception specification ignored except to indicate a function is not __declspec(nothrow) + /wd4345 # Disable warning C4345: behavior change: an object of POD type constructed with an initializer of the form () will be default-initialized /wd4355 # Disable warning C4355: 'this' : used in base member initializer list /wd4503 # Disable warning C4503: decorated name length exceeded, name was truncated - /wd4068 # Disable warning C4068: unknown pragma - /wd4091 # Disable warning C4091: 'typedef' : ignored on left of X when no variable is declared ) if (CMAKE_SIZEOF_VOID_P EQUAL 8) set (c_compiler_flags_common