More VS2015 fixes
This commit is contained in:
parent
add3a934af
commit
729c9e3faa
@ -361,10 +361,15 @@ if(WIN32)
|
||||
# SET(WARNING_FLAGS "${WARNING_FLAGS} /wd${warning}")
|
||||
# endforeach(warning)
|
||||
|
||||
set(MSVC_FLAGS "-DWIN32 -DNOMINMAX -D_USE_MATH_DEFINES -D_CRT_SECURE_NO_WARNINGS -D__CRT_NONSTDC_NO_WARNINGS /wd4996 /wd4250 -Dstrdup=_strdup")
|
||||
set(MSVC_FLAGS "-DWIN32 -DNOMINMAX -D_USE_MATH_DEFINES -D_CRT_SECURE_NO_WARNINGS -D__CRT_NONSTDC_NO_WARNINGS /wd4996 /wd4250")
|
||||
if (${MSVC_VERSION} GREATER 1599)
|
||||
set( MSVC_LD_FLAGS "/FORCE:MULTIPLE" )
|
||||
endif (${MSVC_VERSION} GREATER 1599)
|
||||
|
||||
if (${MSVC_VERSION} GREATER 1899)
|
||||
# needed for debug builds with VS2015
|
||||
set( MSVC_FLAGS "${MSVC_FLAGS} /bigobj" )
|
||||
endif()
|
||||
endif(MSVC)
|
||||
|
||||
# assumed on Windows
|
||||
|
@ -66,6 +66,7 @@
|
||||
# if _MSC_VER >= 1200 // msvc++ 6.0 up to MSVC2013
|
||||
# if _MSC_VER < 1900
|
||||
# define snprintf _snprintf
|
||||
# define strdup _strdup
|
||||
# endif
|
||||
# if _MSC_VER < 1800
|
||||
# define isnan _isnan
|
||||
@ -81,7 +82,7 @@
|
||||
|
||||
# pragma warning(disable: 4786) // identifier was truncated to '255' characters
|
||||
# pragma warning(disable: 4244) // conversion from double to float
|
||||
# pragma warning(disable: 4305) //
|
||||
# pragma warning(disable: 4305) // truncation from larer type to smaller
|
||||
|
||||
# else
|
||||
# error What version of MSVC++ is this?
|
||||
|
Loading…
Reference in New Issue
Block a user