VS2015 compatability fixes.
This commit is contained in:
parent
861b682acf
commit
0da1fc574d
3 changed files with 12 additions and 3 deletions
4
3rdparty/iaxclient/lib/libiax2/src/winpoop.h
vendored
4
3rdparty/iaxclient/lib/libiax2/src/winpoop.h
vendored
|
@ -15,7 +15,11 @@
|
|||
#if defined(_MSC_VER)
|
||||
#define INLINE __inline
|
||||
#define inline __inline
|
||||
|
||||
#if _MSC_VER < 1900
|
||||
#define snprintf _snprintf
|
||||
#endif
|
||||
|
||||
// should try without these
|
||||
#pragma warning(disable: 4996 4244 4305 4018 4804)
|
||||
#if defined(_WIN64)
|
||||
|
|
|
@ -362,10 +362,15 @@ if(WIN32)
|
|||
# SET(WARNING_FLAGS "${WARNING_FLAGS} /wd${warning}")
|
||||
# endforeach(warning)
|
||||
|
||||
set(MSVC_FLAGS "-DNOMINMAX -D_USE_MATH_DEFINES -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS -D__CRT_NONSTDC_NO_WARNINGS -Dstrdup=_strdup")
|
||||
set(MSVC_FLAGS "-DNOMINMAX -D_USE_MATH_DEFINES -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS -D__CRT_NONSTDC_NO_WARNINGS")
|
||||
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)
|
||||
|
||||
set(NOMINMAX 1)
|
||||
|
|
|
@ -25,8 +25,8 @@
|
|||
|
||||
#ifdef HAVE_WINDOWS_H
|
||||
#include <windows.h>
|
||||
#define snprintf sprintf_s
|
||||
#endif
|
||||
|
||||
#if defined (SG_MAC)
|
||||
#include <OpenGL/gl.h>
|
||||
#include <GLUT/glut.h>
|
||||
|
|
Loading…
Reference in a new issue