diff options
| author | Ulf Lamping <ulf.lamping@web.de> | 2007-01-31 05:26:41 +0000 |
|---|---|---|
| committer | Ulf Lamping <ulf.lamping@web.de> | 2007-01-31 05:26:41 +0000 |
| commit | cd5aae8116e57519316bf427d6ef31c25be84f04 (patch) | |
| tree | a29769b92fa9996b1bd4a8fdfd7aeaf8ef1272f0 /wiretap | |
| parent | b7eca1050cedc87fab9bbb11943454afd023f5ba (diff) | |
instead of putting the MSC_VER_REQUIRED test into the root Makefile (which would require to change ALL makefiles - the buildbot revealed it), simply put it in the wiretap generation. As wiretap is mandatory and one of the first things to be build this doesn't even sound like a bad idea anyway ...
svn path=/trunk/; revision=20646
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/Makefile.nmake | 2 | ||||
| -rw-r--r-- | wiretap/config.h.win32 | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/wiretap/Makefile.nmake b/wiretap/Makefile.nmake index 4a07e477e6..0af5a8f81b 100644 --- a/wiretap/Makefile.nmake +++ b/wiretap/Makefile.nmake @@ -10,7 +10,7 @@ include <win32.mak> include Makefile.common CFLAGS=-DHAVE_CONFIG_H $(GLIB_CFLAGS) $(ZLIB_CFLAGS) /I$(PCAP_DIR)/include \ - -D_U_="" $(LOCAL_CFLAGS) + -D_U_="" $(LOCAL_CFLAGS) -DMSC_VER_REQUIRED=$(MSC_VER_REQUIRED) CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL diff --git a/wiretap/config.h.win32 b/wiretap/config.h.win32 index 6d00ecba08..6ad9bcf7dc 100644 --- a/wiretap/config.h.win32 +++ b/wiretap/config.h.win32 @@ -50,3 +50,11 @@ /* Needed for zlib, according to http://www.winimage.com/zLibDll/ */ /*#define ZLIB_DLL 1 #define _WINDOWS 1*/ + +/* Check for the required _MSC_VER */ +#if MSC_VER_REQUIRED != _MSC_VER +#define WS_TO_STRING2(x) #x +#define WS_TO_STRING(x) WS_TO_STRING2(x) +#pragma message( "_MSC_VER is:" WS_TO_STRING(_MSC_VER) " but required is:" WS_TO_STRING(MSC_VER_REQUIRED) ) +#error Your MSVC_VARIANT setting in config.nmake doesn't match the MS compiler version! +#endif |