blender
/
blender
129
397
Fork 571
Code Issues 6.2k Pull Requests 753 Projects 19 Wiki Activity

Make cycles compile with MSVC 2015

This commit is contained in:
Martijn Berger 2015-12-29 18:59:23 +01:00
parent a6b67ca802
commit 5e974a350f
Notes: blender-bot 2023-02-14 08:20:35 +01:00 
Referenced by issue #47134, Failed to copy full data path
Referenced by issue #47100, Open Cl Kernel Warnings
Referenced by issue #47101, Grease Pencil eraser doesn't work when activated using D+RMB when using a tablet
Referenced by issue #47087, Bmesh booleans fails when A mesh have coincident edge with B
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -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}

4
extern/cuew/src/cuew.c vendored
View File

@ -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