VS2015 compilation fixes

--HG--
branch : develop

code/CMakeModules/nel.cmake

@@ -525,7 +525,13 @@ MACRO(NL_SETUP_BUILD)
     # Ignore default include paths
     ADD_PLATFORM_FLAGS("/X")
 
-    IF(MSVC12)
+    IF(MSVC14)
+      ADD_PLATFORM_FLAGS("/Gy- /MP")
+      # /Ox is working with VC++ 2015, but custom optimizations don't exist
+      SET(RELEASE_CFLAGS "/Ox /GF /GS- ${RELEASE_CFLAGS}")
+      # without inlining it's unusable, use custom optimizations again
+      SET(DEBUG_CFLAGS "/Od /Ob1 /GF- ${DEBUG_CFLAGS}")
+    ELSEIF(MSVC12)
       ADD_PLATFORM_FLAGS("/Gy- /MP")
       # /Ox is working with VC++ 2013, but custom optimizations don't exist
       SET(RELEASE_CFLAGS "/Ox /GF /GS- ${RELEASE_CFLAGS}")
@@ -557,7 +563,7 @@ MACRO(NL_SETUP_BUILD)
       SET(DEBUG_CFLAGS "/Od /Ob1 ${DEBUG_CFLAGS}")
     ELSE(MSVC12)
       MESSAGE(FATAL_ERROR "Can't determine compiler version ${MSVC_VERSION}")
-    ENDIF(MSVC12)
+    ENDIF(MSVC14)
 
     ADD_PLATFORM_FLAGS("/D_CRT_SECURE_NO_DEPRECATE /D_CRT_SECURE_NO_WARNINGS /D_CRT_NONSTDC_NO_WARNINGS /DWIN32 /D_WINDOWS /Zm1000 /wd4250")
 

code/nel/include/nel/misc/types_nl.h

@@ -67,7 +67,10 @@
 #	endif
 #	ifdef _MSC_VER
 #		define NL_COMP_VC
-#		if _MSC_VER >= 1800
+#		if _MSC_VER >= 1900
+#			define NL_COMP_VC14
+#			define NL_COMP_VC_VERSION 140
+#		elif _MSC_VER >= 1800
 #			define NL_COMP_VC12
 #			define NL_COMP_VC_VERSION 120
 #		elif _MSC_VER >= 1700

code/nel/src/misc/system_utils.cpp

@@ -23,6 +23,32 @@
 #include <windows.h>
 #include <string.h>
 #include <stdio.h>
+#ifdef DXGI_STATUS_OCCLUDED
+#undef DXGI_STATUS_OCCLUDED
+#undef DXGI_STATUS_CLIPPED
+#undef DXGI_STATUS_NO_REDIRECTION
+#undef DXGI_STATUS_NO_DESKTOP_ACCESS
+#undef DXGI_STATUS_GRAPHICS_VIDPN_SOURCE_IN_USE
+#undef DXGI_STATUS_MODE_CHANGED
+#undef DXGI_STATUS_MODE_CHANGE_IN_PROGRESS
+#endif
+#ifdef DXGI_ERROR_INVALID_CALL
+#undef DXGI_ERROR_INVALID_CALL
+#undef DXGI_ERROR_NOT_FOUND
+#undef DXGI_ERROR_MORE_DATA
+#undef DXGI_ERROR_UNSUPPORTED
+#undef DXGI_ERROR_DEVICE_REMOVED
+#undef DXGI_ERROR_DEVICE_HUNG
+#undef DXGI_ERROR_DEVICE_RESET
+#undef DXGI_ERROR_WAS_STILL_DRAWING
+#undef DXGI_ERROR_FRAME_STATISTICS_DISJOINT
+#undef DXGI_ERROR_GRAPHICS_VIDPN_SOURCE_IN_USE
+#undef DXGI_ERROR_DRIVER_INTERNAL_ERROR
+#undef DXGI_ERROR_NONEXCLUSIVE
+#undef DXGI_ERROR_NOT_CURRENTLY_AVAILABLE
+#undef DXGI_ERROR_REMOTE_CLIENT_DISCONNECTED
+#undef DXGI_ERROR_REMOTE_OUTOFMEMORY
+#endif
 #include <dxgi.h>
 #include <initguid.h>
 #include <CGuid.h>