Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt4
-rw-r--r--extern/cuew/src/cuew.c4
2 files changed, 5 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2d4fb2b7254..79844bb0e50 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 3058e29d89f..70ac349ea0d 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