[Bf-blender-cvs] [5e974a3] master: Make cycles compile with MSVC 2015

[Martijn Berger]

Commit: 5e974a350f84ec354749878967a46e0b4a06c45d
Author: Martijn Berger
Date:   Tue Dec 29 18:59:23 2015 +0100
Branches: master
https://developer.blender.org/rB5e974a350f84ec354749878967a46e0b4a06c45d

Make cycles compile with MSVC 2015

===================================================================

M	CMakeLists.txt
M	extern/cuew/src/cuew.c

===================================================================

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2d4fb2b..79844bb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1486,8 +1486,8 @@ elseif(WIN32)
 					set(BOOST_DEBUG_POSTFIX "vc120-mt-sgd-1_55.lib")
 				else()
 					set(BOOST_LIBPATH ${BOOST}/lib)
-					set(BOOST_POSTFIX "vc90-mt-s-1_49.lib")
-					set(BOOST_DEBUG_POSTFIX "vc90-mt-sgd-1_49.lib")
+					set(BOOST_POSTFIX "vc140-mt-s-1_60.lib")
+					set(BOOST_DEBUG_POSTFIX "vc140-mt-sgd-1_60.lib")
 				endif()
 				set(BOOST_LIBRARIES
 					optimized libboost_date_time-${BOOST_POSTFIX} optimized libboost_filesystem-${BOOST_POSTFIX}
diff --git a/extern/cuew/src/cuew.c b/extern/cuew/src/cuew.c
index 3058e29..70ac349 100644
--- a/extern/cuew/src/cuew.c
+++ b/extern/cuew/src/cuew.c
@@ -15,7 +15,9 @@
  */
 
 #ifdef _MSC_VER
-#  define snprintf _snprintf
+#  if _MSC_VER < 1900
+#    define snprintf _snprintf
+#  endif
 #  define popen _popen
 #  define pclose _pclose
 #  define _CRT_SECURE_NO_WARNINGS