add a check if the MSVC_VARIANT setting and the current _MSC_VER #define matches...

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20591 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/config.h.win32 b/config.h.win32
index 1be2f1856ee70d555ddf0b5049a04152f14caf4b..516a2c79b796875d1e409aff4f4b152a8881179e 100644 (file)
--- a/config.h.win32
+++ b/config.h.win32
@@ -253,3 +253,15 @@
 
 /* We shouldn't need this under Windows but we'll define it anyway. */
 #define HTML_VIEWER "mozilla"
+
+/* check if the MSVC_VARIANT setting in config.nmake and the current MSVC compiler version matches together */
+/* user might forget to set this or the PATH to the C compiler could be wrong */
+#if _MSC_VER != 1400 && (MSVC_VARIANT == MSVC2005EE || MSVC_VARIANT == MSVC2005 || MSVC_VARIANT == DOTNET20 || MSVC_VARIANT == DOTNET30)
+#error Your MSVC_VARIANT setting in config.nmake and the C compiler version 14.00 (V8.0) don't match!
+#elseif _MSC_VER != 1310 && (MSVC_VARIANT == MSVC2003 || MSVC_VARIANT == DOTNET11)
+#error Your MSVC_VARIANT setting in config.nmake and the C compiler version 13.10 (V7.1) don't match!
+#elseif _MSC_VER != 1300 && (MSVC_VARIANT == MSVC2002 || MSVC_VARIANT == DOTNET10)
+#error Your MSVC_VARIANT setting in config.nmake and the C compiler version 13.00 (V7.0) don't match!
+#elseif _MSC_VER != 1200 && (MSVC_VARIANT == MSVC6)
+#error Your MSVC_VARIANT setting in config.nmake and the C compiler version 12.00 (V6.0) don't match!
+#endif