aboutsummaryrefslogtreecommitdiffstats
path: root/epan/Makefile.nmake
diff options
context:
space:
mode:
Diffstat (limited to 'epan/Makefile.nmake')
-rw-r--r--epan/Makefile.nmake9
1 files changed, 5 insertions, 4 deletions
diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake
index c1d69fb2c9..3cfa7ecda7 100644
--- a/epan/Makefile.nmake
+++ b/epan/Makefile.nmake
@@ -12,13 +12,14 @@ include Makefile.common
LINK= link
# We use GENERATED_CFLAGS to get around flex's non-LLP64-compliant output
-GENERATED_CFLAGS=-DHAVE_CONFIG_H /I. /I.. /I../wiretap $(GLIB_CFLAGS) \
+GENERATED_CFLAGS=\
+ $(STANDARD_CFLAGS) \
+ /I. /I.. /I../wiretap $(GLIB_CFLAGS) \
$(ZLIB_CFLAGS) $(C_ARES_CFLAGS) $(ADNS_CFLAGS) $(PCRE_CFLAGS) \
$(LUA_CFLAGS) $(GNUTLS_CFLAGS) /I$(PCAP_DIR)\include \
- $(SMI_CFLAGS) $(GEOIP_CFLAGS) -D_U_="" $(LOCAL_CFLAGS)
-CFLAGS=-WX $(GENERATED_CFLAGS)
+ $(SMI_CFLAGS) $(GEOIP_CFLAGS)
-CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL
+CFLAGS=$(WARNINGS_ARE_ERRORS) $(GENERATED_CFLAGS)
!IFDEF LUA_DIR
WSLUA_LIB=wslua\wslua.lib