More VS2015 fixes

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 767749234f2e3dd92c23481f872b2d043a34dfb7..20ad8741816c7fb7c19f4a1fe6463f903ccafe5e 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -359,10 +359,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

diff --git a/simgear/compiler.h b/simgear/compiler.h
index 43e1c07d675273b27fd4780af3bd176a9476f89a..f6bdc37c38fae51e1fc71e8a38436123122b8156 100644 (file)
--- a/simgear/compiler.h
+++ b/simgear/compiler.h
@@ -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?