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 /Makefile.nmake | |
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 'Makefile.nmake')
-rw-r--r-- | Makefile.nmake | 2 |
1 files changed, 1 insertions, 1 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 |