VS2015 compatability fixes.

diff --git a/3rdparty/iaxclient/lib/libiax2/src/winpoop.h b/3rdparty/iaxclient/lib/libiax2/src/winpoop.h
index 4e9d1120804d92aff677ba79b64020445d97403c..03d80dde75e4e2b5dbd54d2b58ed8795e6b5909c 100644 (file)
--- a/3rdparty/iaxclient/lib/libiax2/src/winpoop.h
+++ b/3rdparty/iaxclient/lib/libiax2/src/winpoop.h
@@ -15,8 +15,12 @@
 #if defined(_MSC_VER)
 #define INLINE __inline
 #define inline __inline
+
+#if _MSC_VER < 1900
 #define snprintf _snprintf
-// should try without these
+#endif
+
+ // should try without these
 #pragma warning(disable: 4996 4244 4305 4018 4804)
 #if defined(_WIN64)
    typedef __int64      ssize_t;

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ab74f68d6f4caecd67a5a3f4240f975049593681..914133f1641fc6a1c0b0b718cf0cb9e5b0f0f80b 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -360,10 +360,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)

diff --git a/utils/fgpanel/FGGLApplication.cxx b/utils/fgpanel/FGGLApplication.cxx
index 2783737d924d39e1b5d4e3044ac317ca252a6127..30bbba2f737ab459b1534708ba85f83ee711697a 100644 (file)
--- a/utils/fgpanel/FGGLApplication.cxx
+++ b/utils/fgpanel/FGGLApplication.cxx
@@ -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>