Merge pull request #1158 from dictoon/master

Fix VS 2012 build
appleseedhq · Dec 14, 2016 · 53cea57 · 53cea57
2 parents 824f4d9 + 6bca9e9
commit 53cea57
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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