From cd5aae8116e57519316bf427d6ef31c25be84f04 Mon Sep 17 00:00:00 2001 From: Ulf Lamping Date: Wed, 31 Jan 2007 05:26:41 +0000 Subject: [PATCH] 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 --- Makefile.nmake | 2 +- config.h.win32 | 8 -------- wiretap/Makefile.nmake | 2 +- wiretap/config.h.win32 | 8 ++++++++ 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Makefile.nmake b/Makefile.nmake index e31a05a8e9..16a974c69b 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -17,7 +17,7 @@ CFLAGS=-DHAVE_CONFIG_H $(LOCAL_CFLAGS) $(GLIB_CFLAGS) /I. /Iwiretap \ $(ZLIB_CFLAGS) /I$(PCAP_DIR)\include \ $(NET_SNMP_CFLAGS) \ $(ADNS_CFLAGS) $(PCRE_CFLAGS) $(GNUTLS_CFLAGS) $(LUA_CFLAGS) \ - -D_U_="" -D_NEED_VAR_IMPORT_ -DMSC_VER_REQUIRED=$(MSC_VER_REQUIRED) + -D_U_="" -D_NEED_VAR_IMPORT_ CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL diff --git a/config.h.win32 b/config.h.win32 index 4d5d605262..1be2f1856e 100644 --- a/config.h.win32 +++ b/config.h.win32 @@ -253,11 +253,3 @@ /* We shouldn't need this under Windows but we'll define it anyway. */ #define HTML_VIEWER "mozilla" - -/* 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 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 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