fly/flightgear
1
0
Fork 0
Code Activity

VS2015 compatability fixes.

Browse source
This commit is contained in:
James Turner 2016-06-01 22:58:03 +01:00
parent 861b682acf
commit 0da1fc574d
3 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
3rdparty/iaxclient/lib/libiax2/src/winpoop.h vendored
View file

@ -15,7 +15,11 @@
#if defined(_MSC_VER) #if defined(_MSC_VER)
#define INLINE __inline #define INLINE __inline
#define inline __inline #define inline __inline
#if _MSC_VER < 1900
#define snprintf _snprintf #define snprintf _snprintf
#endif
// should try without these // should try without these
#pragma warning(disable: 4996 4244 4305 4018 4804) #pragma warning(disable: 4996 4244 4305 4018 4804)
#if defined(_WIN64) #if defined(_WIN64)

7
CMakeLists.txt
View file

@ -362,10 +362,15 @@ if(WIN32)
# SET(WARNING_FLAGS "${WARNING_FLAGS} /wd${warning}") # SET(WARNING_FLAGS "${WARNING_FLAGS} /wd${warning}")
# endforeach(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) if (${MSVC_VERSION} GREATER 1599)
set( MSVC_LD_FLAGS "/FORCE:MULTIPLE" ) set( MSVC_LD_FLAGS "/FORCE:MULTIPLE" )
endif (${MSVC_VERSION} GREATER 1599) 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) endif(MSVC)
set(NOMINMAX 1) set(NOMINMAX 1)

2
utils/fgpanel/FGGLApplication.cxx
View file

@ -25,8 +25,8 @@
#ifdef HAVE_WINDOWS_H #ifdef HAVE_WINDOWS_H
#include <windows.h> #include <windows.h>
#define snprintf sprintf_s
#endif #endif
#if defined (SG_MAC) #if defined (SG_MAC)
#include <OpenGL/gl.h> #include <OpenGL/gl.h>
#include <GLUT/glut.h> #include <GLUT/glut.h>