aboutsummaryrefslogtreecommitdiffstats
path: root/config.h.win32
diff options
context:
space:
mode:
authorUlf Lamping <ulf.lamping@web.de>2007-01-28 20:58:50 +0000
committerUlf Lamping <ulf.lamping@web.de>2007-01-28 20:58:50 +0000
commit88af5759da6643ffc4cd8b114e145ee31cae54a8 (patch)
treeb1d4fb5e5e914160688b1ee40b12949d02a13388 /config.h.win32
parentbf2696032cc0850ce50e11c788ef036549213b16 (diff)
add a check if the MSVC_VARIANT setting and the current _MSC_VER #define matches - to avoid problems if a developer forgets to set MSVC_VARIANT in config.nmake corresponding to his environment
svn path=/trunk/; revision=20591
Diffstat (limited to 'config.h.win32')
-rw-r--r--config.h.win3212
1 files changed, 12 insertions, 0 deletions
diff --git a/config.h.win32 b/config.h.win32
index 1be2f1856e..516a2c79b7 100644
--- 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