Backport r29665 to template file so that the change is not overwritten when we regene...
[obnox/wireshark/wip.git] / config.nmake
index 1eec731cc6ad86e23e6b90ec5dee48a5b6479da5..c8b02891d90d1106015b5fa62b5086b78d2370bb 100644 (file)
@@ -15,8 +15,8 @@ WIRESHARK_TARGET_PLATFORM=win32
 # The current Wireshark version
 # It's highly recommended to leave MAJOR/MINOR/MICRO unchanged
 VERSION_MAJOR=1
-VERSION_MINOR=1
-VERSION_MICRO=4
+VERSION_MINOR=3
+VERSION_MICRO=1
 VERSION_BUILD=0
 # It's recommended to change VERSION_EXTRA for your own custom builds
 # e.g. "-SVN-12345"
@@ -56,11 +56,13 @@ TOOLS_DIR=tools
 # (sorry ARM, Alpha, MIPS, and Itanium fans).
 # CPU (Used by win32.mak) should be one of "i386" or "AMD64".
 !if "$(WIRESHARK_TARGET_PLATFORM)" == "win32"
-TARGET_MACHINE=X86
+TARGET_MACHINE=x86
 CPU=i386
+VCREDIST_DLL=x86
 !else if "$(WIRESHARK_TARGET_PLATFORM)" == "win64"
-TARGET_MACHINE=X64
+TARGET_MACHINE=x64
 CPU=AMD64
+VCREDIST_DLL=amd64
 !else
 !error Your mysterious moon-man architecture "$(WIRESHARK_TARGET_PLATFORM)" frightens and confuses us.
 !endif
@@ -135,25 +137,40 @@ NASM=$(WIRESHARK_LIBS)\nasm-2.02\nasm.exe
 # Please note: Since Wireshark release 1.0.0, we no longer support GLib1.x
 #
 GLIB_VERSION=2.0
-GLIB_PKG=2.18.4-1
 GLIB_DIR=$(WIRESHARK_LIBS)\glib
+# This macro is used by the setup target.
+GLIB_PKG=2.20.5-1
+
+##### To Use new packet list uncomment this line ####
+### Warning Experimental - work in progress
+NEW_PACKET_LIST_CONFIG=^#define NEW_PACKET_LIST 1
 
 #
 # Mandatory: GTK (& related libs) settings
 #
 # Please note: Since Wireshark release 1.0.0, we no longer support GTK1.x
 #
-# If you want building with GTK+, set GTK_DIR to the pathname of the 
+# If you want building with GTK+, set GTK_DIR to the pathname of the
 # directory in which the "include" and "lib" directories reside.
 #
 GTK_DIR=$(WIRESHARK_LIBS)\gtk2
-GTK_PKG=2.14.7-1
-CAIRO_PKG=1.8.6-1
-ATK_PKG=1.24.0-1
-LIBPNG_PKG=1.2.32-1
-TIFF_PKG=tiff-3.8.2-1-bin
-JPEG_PKG=jpeg-6b-4-bin
-PANGO_PKG=1.22.2-1
+# These macros are used by the nsis installer script and by the install target.
+TIFF_DLL=libtiff-3.dll
+JPEG_DLL=libjpeg-7.dll
+FREETYPE_DLL=freetype6.dll
+FONTCONFIG_DLL=libfontconfig-1.dll
+EXPAT_DLL=libexpat-1.dll
+# These macros are used by the setup target.
+GTK_PKG=2.16.6-1
+CAIRO_PKG=1.8.8-2
+ATK_PKG=1.26.0-1
+LIBPNG_PKG=1.2.39-1
+TIFF_PKG=libtiff_3.9.1-1_win32
+JPEG_PKG=jpeg_7-1_win32
+PANGO_PKG=1.24.5-2
+FREETYPE_PKG=2.3.9-1
+FONTCONFIG_PKG=2.7.3-1
+EXPAT_PKG=2.0.1-1
 
 #
 # Mandatory: Version numbers of GTK and pango.
@@ -162,8 +179,20 @@ PANGO_PKG=1.22.2-1
 # These macros are used by the nsis installer script and by the setup target.
 #
 # GTK 2.12 is the mainline since Wireshark 0.99.7
-GTK_INST_VERSION=2.14
-PANGO_INST_VERSION=1.22
+GTK_INST_VERSION=2.16
+PANGO_INST_VERSION=1.24
+
+#
+# Mandatory for GTK >= 2: Gettext
+#
+# Set GETTEXT_DIR to the directory in which the
+# GETTEXT include files and library resides.
+#
+GETTEXT_DIR=$(WIRESHARK_LIBS)\gettext-runtime-0.17-1
+# This macro is used by the nsis installer script and by the install target.
+GETTEXT_DLL=intl.dll
+# This macro is used by the setup target.
+GETTEXT_PKG=-runtime-0.17-1
 
 #
 # Optional: WinPcap developer's pack to capture network traffic.
@@ -174,8 +203,9 @@ PANGO_INST_VERSION=1.22
 # If you don't have the WPdpack, comment this line out, so that
 # PCAP_DIR isn't defined.
 #
-PCAP_VERSION=4_0_2
 PCAP_DIR=$(WIRESHARK_LIBS)\WPdpack
+# This macro is used by the nsis installer script, by the u3/portable apps and by the setup target.
+PCAP_VERSION=4_1_beta5
 
 #
 # Optional: WinPcap remote capture support and new API
@@ -247,8 +277,7 @@ PCRE_DIR=$(WIRESHARK_LIBS)\pcre-7.0
 # isn't defined.
 #
 # Platform SDK conflicts with openssl.h header
-#GNUTLS_DIR=$(WIRESHARK_LIBS)\gnutls-2.6.3-1
-GNUTLS_DIR=$(WIRESHARK_LIBS)\gnutls-2.6.4-1
+GNUTLS_DIR=$(WIRESHARK_LIBS)\gnutls-2.8.1-1
 
 #
 # Optional: the KFW library enables kerberos/sasl/dcerpc decryption.
@@ -259,7 +288,7 @@ GNUTLS_DIR=$(WIRESHARK_LIBS)\gnutls-2.6.4-1
 # If you don't have KFW, comment this line out, so that KFW_DIR
 # isn't defined.
 #
-KFW_DIR=$(WIRESHARK_LIBS)\kfw-2.5
+KFW_DIR=$(WIRESHARK_LIBS)\kfw-3.2.2-ws1
 
 #
 # Optional: the Nettle library enables ??? decryption.
@@ -302,23 +331,6 @@ PORTAUDIO_DIR=$(WIRESHARK_LIBS)\portaudio_v19_2
 #PORTAUDIO_VERSION=18
 PORTAUDIO_VERSION=19
 
-#
-# Iconv: Mandatory for Glib >= 2 and <= 2.14.4
-# [win-iconv statically linked as part of Glib >= 2.14.5]
-# Set ICONV_DIR to the directory in which the
-# ICONV include files and library resides.
-#
-##ICONV_DIR=$(WIRESHARK_LIBS)\libiconv-1.9.1.bin.woe32
-
-#
-# Mandatory for GTK >= 2: Gettext
-#
-# Set GETTEXT_DIR to the directory in which the
-# GETTEXT include files and library resides.
-#
-#GETTEXT_DIR=$(WIRESHARK_LIBS)\gettext-0.14.5
-GETTEXT_PKG=-runtime-0.17-1
-GETTEXT_DIR=$(WIRESHARK_LIBS)\gettext-runtime-0.17-1
 #
 # Optional: AirPcap developer's pack to capture wireless network traffic
 # incl. 802.11 management frames.
@@ -358,25 +370,40 @@ GEOIP_DIR=$(WIRESHARK_LIBS)\GeoIP-1.4.5ws
 # Please note: Since Wireshark release 1.0.0, we no longer support GLib1.x
 #
 GLIB_VERSION=2.0
-GLIB_PKG=2.18.4-1
 GLIB_DIR=$(WIRESHARK_LIBS)\glib
+# This macro is used by the setup target.
+GLIB_PKG=2.20.5-1
+
+##### To Use new packet list uncomment this line ####
+### Warning Experimental - work in progress
+#NEW_PACKET_LIST_CONFIG=^#define NEW_PACKET_LIST 1
 
 #
 # Mandatory: GTK (& related libs) settings
 #
 # Please note: Since Wireshark release 1.0.0, we no longer support GTK1.x
 #
-# If you want building with GTK+, set GTK_DIR to the pathname of the 
+# If you want building with GTK+, set GTK_DIR to the pathname of the
 # directory in which the "include" and "lib" directories reside.
 #
 GTK_DIR=$(WIRESHARK_LIBS)\gtk2
-GTK_PKG=2.14.7-1
-CAIRO_PKG=1.8.6-1
-ATK_PKG=1.24.0-1
-LIBPNG_PKG=1.2.34-1
-TIFF_PKG=libtiff_3.8.2-1_win64
-JPEG_PKG=jpeg_6b-2_win64
-PANGO_PKG=1.22.4-1
+# These macros are used by the nsis installer script and by the install target.
+TIFF_DLL=libtiff-3.dll
+JPEG_DLL=libjpeg-7.dll
+FREETYPE_DLL=libfreetype-6.dll
+FONTCONFIG_DLL=libfontconfig-1.dll
+EXPAT_DLL=libexpat-1.dll
+# These macros are used by the setup target.
+GTK_PKG=2.16.6-1
+CAIRO_PKG=1.8.8-2
+ATK_PKG=1.26.0-2
+LIBPNG_PKG=1.2.40-1
+TIFF_PKG=libtiff_3.9.1-1_win64
+JPEG_PKG=jpeg_7-1_win64
+PANGO_PKG=1.24.5-2
+FREETYPE_PKG=2.3.9-2
+FONTCONFIG_PKG=2.7.3-1
+EXPAT_PKG=2.0.1-2
 
 #
 # Mandatory: Version numbers of GTK and pango.
@@ -384,9 +411,20 @@ PANGO_PKG=1.22.4-1
 # (MAJOR + MINOR Version number but without MICRO version number)
 # These macros are used by the nsis installer script and by the setup target.
 #
-# GTK 2.12 is the mainline since Wireshark 0.99.7
-GTK_INST_VERSION=2.14
-PANGO_INST_VERSION=1.22
+GTK_INST_VERSION=2.16
+PANGO_INST_VERSION=1.24
+
+#
+# Mandatory for GTK >= 2: Gettext
+#
+# Set GETTEXT_DIR to the directory in which the
+# GETTEXT include files and library resides.
+#
+GETTEXT_DIR=$(WIRESHARK_LIBS)\gettext-0.17-1
+# This macro is used by the nsis installer script and by the install target.
+GETTEXT_DLL=libintl-8.dll
+# This macro is used by the setup target.
+GETTEXT_PKG=_0.17-1_win64
 
 #
 # Optional: WinPcap developer's pack to capture network traffic.
@@ -397,8 +435,9 @@ PANGO_INST_VERSION=1.22
 # If you don't have the WPdpack, comment this line out, so that
 # PCAP_DIR isn't defined.
 #
-PCAP_VERSION=4_1_beta5
 PCAP_DIR=$(WIRESHARK_LIBS)\WPdpack
+# This macro is used by the nsis installer script, by the u3/portable apps and by the setup target.
+PCAP_VERSION=4_1_beta5
 
 #
 # Optional: WinPcap remote capture support and new API
@@ -470,8 +509,7 @@ ZLIB_DIR=$(WIRESHARK_LIBS)\zlib123
 # isn't defined.
 #
 # Platform SDK conflicts with openssl.h header
-#GNUTLS_DIR=$(WIRESHARK_LIBS)\gnutls-1.6.1-1
-#GNUTLS_DIR=$(WIRESHARK_LIBS)\gnutls-2.3.8-1
+#GNUTLS_DIR=$(WIRESHARK_LIBS)\gnutls-2.8.1-1
 
 #
 # Optional: the KFW library enables kerberos/sasl/dcerpc decryption.
@@ -482,7 +520,7 @@ ZLIB_DIR=$(WIRESHARK_LIBS)\zlib123
 # If you don't have KFW, comment this line out, so that KFW_DIR
 # isn't defined.
 #
-#KFW_DIR=$(WIRESHARK_LIBS)\kfw-2.5
+#KFW_DIR=$(WIRESHARK_LIBS)\kfw-3.2.2-ws1
 
 #
 # Optional: the Nettle library enables ??? decryption.
@@ -525,23 +563,6 @@ PORTAUDIO_DIR=$(WIRESHARK_LIBS)\portaudio_v19_2
 #PORTAUDIO_VERSION=18
 PORTAUDIO_VERSION=19
 
-#
-# Iconv: Mandatory for Glib >= 2 and <= 2.14.4
-# [win-iconv statically linked as part of Glib >= 2.14.5]
-# Set ICONV_DIR to the directory in which the
-# ICONV include files and library resides.
-#
-##ICONV_DIR=$(WIRESHARK_LIBS)\libiconv-1.9.1.bin.woe32
-
-#
-# Mandatory for GTK >= 2: Gettext
-#
-# Set GETTEXT_DIR to the directory in which the
-# GETTEXT include files and library resides.
-#
-#GETTEXT_DIR=$(WIRESHARK_LIBS)\gettext-0.14.5
-GETTEXT_PKG=_0.17-1_win64
-GETTEXT_DIR=$(WIRESHARK_LIBS)\gettext-0.17-1
 #
 # Optional: AirPcap developer's pack to capture wireless network traffic
 # incl. 802.11 management frames.
@@ -690,7 +711,7 @@ HHC_DIR=$(PROGRAM_FILES)/HTML Help Workshop
 # comment this line out, so that UPX isn't defined.
 #
 
-UPX=$(WIRESHARK_LIBS)\upx301w\upx.exe
+UPX=$(WIRESHARK_LIBS)\upx303w\upx.exe
 
 ##### Flags, PATHs and Miscellaneous #####
 
@@ -717,18 +738,35 @@ MSC_VER_REQUIRED=1500
 # /D_CRT_NONSTDC_NO_DEPRECATE       Don't warn for "Deprecated CRT Functions" as MSDN calls this
 # /D_BIND_TO_CURRENT_CRT_VERSION=1  Make sure our CRT and manifest versions match (http://msdn.microsoft.com/en-us/library/cc664727.aspx)
 # /DWIN32_LEAN_AND_MEAN             Don't include unnecessary Windows include files (see windows.h)
-# /MP [<number of processes>]       [MSVC2008]: Compiles multiple source files by using multiple processes 
-#                                               Add if desired for compile speedup on machines with 2 or more "effective processors"
 # /MANIFEST:no                      Don't create a SxS manifest. Makes sure our plugins don't load a second copy of the CRT.
 #
 !IF "$(MSVC_VARIANT)" == "MSVC6" || "$(MSVC_VARIANT)" == "MSVC2002" || "$(MSVC_VARIANT)" == "DOTNET10" || "$(MSVC_VARIANT)" == "MSVC2003" || "$(MSVC_VARIANT)" == "DOTNET11"
 LOCAL_CFLAGS=/Zi /W3 /MD /DWIN32_LEAN_AND_MEAN /DMSC_VER_REQUIRED=$(MSC_VER_REQUIRED)
 !ELSEIF "$(MSVC_VARIANT)" == "MSVC2005" || "$(MSVC_VARIANT)" == "MSVC2005EE" || "$(MSVC_VARIANT)" == "DOTNET20" || "$(MSVC_VARIANT)" == "MSVC2008" || "$(MSVC_VARIANT)" == "MSVC2008EE"
-LOCAL_CFLAGS=/Zi /W3 /MD /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DWIN32_LEAN_AND_MEAN /DMSC_VER_REQUIRED=$(MSC_VER_REQUIRED) /D_BIND_TO_CURRENT_CRT_VERSION=1
+LOCAL_CFLAGS=/Zi /W3 /MD /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DWIN32_LEAN_AND_MEAN /DMSC_VER_REQUIRED=$(MSC_VER_REQUIRED)
+!IF "$(WIRESHARK_TARGET_PLATFORM)" != "win64"
+LOCAL_CFLAGS=$(LOCAL_CFLAGS) /D_BIND_TO_CURRENT_CRT_VERSION=1
+!ENDIF
 !ELSE
 !ERROR MSVC_VARIANT unknown
 !ENDIF
 
+# http://msdn.microsoft.com/en-us/library/bb385193.aspx
+# /MP               Compiles multiple source files by using multiple processes
+# /MP[processMax]   If you omit the processMax argument, the compiler retrieves the number of effective processors
+#                   on your computer from the operating system, and creates a process for each processor.
+#
+# The following compiler options and language features that are incompatible with the /MP option:
+#
+# * #import preprocessor directive
+# * /E, /EP
+# * /Gm
+# * /showIncludes
+# * /Yc
+#
+!IF "$(MSVC_VARIANT)" == "MSVC2008" || "$(MSVC_VARIANT)" == "MSVC2008EE"
+LOCAL_CFLAGS= $(LOCAL_CFLAGS) /MP
+!ENDIF
 # Linker flags:
 # /DEBUG  generate debug info
 # /PROFILE generate map file(s) for profiling
@@ -736,7 +774,7 @@ LOCAL_CFLAGS=/Zi /W3 /MD /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE
 # /NODEFAULTLIB:xxx don't use xxx as the standard C library
 #
 LOCAL_LDFLAGS=/DEBUG /MACHINE:$(TARGET_MACHINE)
-DLL_LDFLAGS = 
+DLL_LDFLAGS =
 !IF $(MSC_VER_REQUIRED) >= 1400
 DLL_LDFLAGS = /MANIFEST:no
 !ENDIF
@@ -776,6 +814,11 @@ INSTALL_DIR=wireshark-gtk2
 !IF "$(MSVC_VARIANT)" == "MSVC6"
 # msvcrt.dll will already be available on target machines - nothing additional to install
 
+!ELSEIF "$(WIRESHARK_TARGET_PLATFORM)" == "win64"
+# We're not creating portable packages and therefore don't have to worry about
+# "deploying using xcopy"
+VCREDIST_EXE=$(WIRESHARK_LIBS)\vcredist_$(TARGET_MACHINE).exe
+
 !ELSEIF "$(MSVC_VARIANT)" == "MSVC2002"
 # you probably need to tweak this directory if you don't use the professional edition!
 MSVCR_DLL=$(PROGRAM_FILES)\Microsoft Visual Studio .NET\Visual Studio .NET Professional - English\msvcr70.dll
@@ -791,21 +834,24 @@ MSVCR_DLL=$(PROGRAM_FILES)\Microsoft Visual Studio .NET 2003\Visual Studio .NET
 # no redistributable available for this package!
 
 !ELSEIF "$(MSVC_VARIANT)" == "MSVC2005"
-MSVCR_DLL=$(PROGRAM_FILES)\Microsoft Visual Studio 8\VC\redist\x86\Microsoft.VC80.CRT\*.*
+MSVCR_DLL=$(PROGRAM_FILES)\Microsoft Visual Studio 8\VC\redist\$(VCREDIST_DLL)\Microsoft.VC80.CRT\*.*
 
 !ELSEIF "$(MSVC_VARIANT)" == "MSVC2005EE" || "$(MSVC_VARIANT)" == "DOTNET20" || "$(MSVC_VARIANT)" == "MSVC2008EE"
 # you need to download the redistributable package vcredist_x86.exe from Microsoft first,
 # and copy it to the lib folder!!!
-VCREDIST_EXE=$(WIRESHARK_LIBS)\vcredist_x86.exe
+VCREDIST_EXE=$(WIRESHARK_LIBS)\vcredist_$(TARGET_MACHINE).exe
 
 !ELSEIF "$(MSVC_VARIANT)" == "MSVC2008"
-MSVCR_DLL=$(PROGRAM_FILES)\Microsoft Visual Studio 9.0\VC\redist\x86\Microsoft.VC90.CRT\*.*
+MSVCR_DLL=$(PROGRAM_FILES)\Microsoft Visual Studio 9.0\VC\redist\$(VCREDIST_DLL)\Microsoft.VC90.CRT\*.*
 
 !ELSE
 !ERROR MSVC_VARIANT unknown
 !ENDIF
 
-
+!IF DEFINED(VCREDIST_EXE) && ! EXIST("$(VCREDIST_EXE)")
+!ERROR Can't find $(VCREDIST_EXE). Have you downloaded it from Microsoft? \
+See the developer's guide section "C-Runtime "Redistributable" files" for details how to get it
+!ENDIF
 
 ##### Advanced: Docbook/XML documentation generation #####
 # If you want to generate the Docbook/XML based docs (User's and Developer's
@@ -884,14 +930,13 @@ RC_VERSION=$(VERSION_MAJOR),$(VERSION_MINOR),$(VERSION_MICRO),$(VERSION_BUILD)
 WTAP_VERSION=$(WTAP_VERSION_MAJOR).$(WTAP_VERSION_MINOR).$(WTAP_VERSION_MICRO)
 RC_WTAP_VERSION=$(WTAP_VERSION_MAJOR),$(WTAP_VERSION_MINOR),$(WTAP_VERSION_MICRO)
 
-
+# GLib
 GLIB_CFLAGS=/I$(GLIB_DIR)\include\glib-$(GLIB_VERSION) \
        /I$(GLIB_DIR)\lib\glib-$(GLIB_VERSION)\include
-GCC_GLIB_CFLAGS=-I$(GLIB_DIR)\include\glib-$(GLIB_VERSION) \
-       -I$(GLIB_DIR)\lib\glib-$(GLIB_VERSION)\include
 GLIB_LIBS=$(GLIB_DIR)\lib\glib-$(GLIB_VERSION).lib \
        $(GLIB_DIR)\lib\gmodule-$(GLIB_VERSION).lib \
        $(GLIB_DIR)\lib\gobject-$(GLIB_VERSION).lib
+GTHREAD_LIBS=$(GLIB_DIR)\lib\gthread-$(GLIB_VERSION).lib \
 
 # GTK+
 GTK_CFLAGS=$(GLIB_CFLAGS) /I$(GTK_DIR)\include\gtk-2.0 \
@@ -905,17 +950,7 @@ GTK_LIBS=$(GTK_DIR)\lib\gtk-win32-2.0.lib \
        $(GTK_DIR)\lib\pango-1.0.lib \
        $(GLIB_LIBS)
 
-!IF "$(GTK_INST_VERSION)" == "2.14"
-GTK_LIB_DIR=2.10.0
-NEED_LIBPNG_DLL=USE
-NEED_LIBJPEG_DLL=USE
-NEED_LIBTIFF_DLL=USE
-NEED_CAIRO_DLL=USE
-GTK_WIMP_DLLSRC_DIR=$(GTK_DIR)\lib\gtk-2.0\2.10.0\engines
-GTK_WIMP_DLLDST_DIR=lib\gtk-2.0\2.10.0\engines
-GTK_WIMP_RCSRC_DIR=$(GTK_DIR)\share\themes\MS-Windows\gtk-2.0
-GTK_WIMP_RCDST_DIR=etc\gtk-2.0
-!ELSEIF "$(GTK_INST_VERSION)" == "2.12"
+!IF "$(GTK_INST_VERSION)" == "2.16" || "$(GTK_INST_VERSION)" == "2.14" || "$(GTK_INST_VERSION)" == "2.12"
 GTK_LIB_DIR=2.10.0
 NEED_LIBPNG_DLL=USE
 NEED_LIBJPEG_DLL=USE
@@ -929,16 +964,18 @@ GTK_WIMP_RCDST_DIR=etc\gtk-2.0
 !ERROR ? Unknown or invalid GTK_INST_VERSION
 !ENDIF
 
-!IF "$(PANGO_INST_VERSION)" == "1.22"
-PANGO_LIB_DIR=1.5.0
-!ELSEIF "$(PANGO_INST_VERSION)" == "1.18"
-PANGO_LIB_DIR=1.5.0
-!ELSEIF "$(PANGO_INST_VERSION)" == "1.16"
+!IF "$(PANGO_INST_VERSION)" == "1.24" || "$(PANGO_INST_VERSION)" == "1.22" || "$(PANGO_INST_VERSION)" == "1.18" || "$(PANGO_INST_VERSION)" == "1.16"
 PANGO_LIB_DIR=1.5.0
 !ELSE
 !ERROR ? Unknown or invalid PANGO_INST_VERSION
 !ENDIF
 
+!IF "$(PANGO_INST_VERSION)" == "1.24"
+#PANGO 1.24.5 Needs these:
+NEED_FREETYPE_DLL=USE
+NEED_FONTCONFIG_DLL=USE
+NEED_EXPAT_DLL=USE
+!ENDIF
 !IFDEF AIRPCAP_DIR
 AIRPCAP_CONFIG=^#define HAVE_AIRPCAP 1
 AIRPDCAP_CONFIG=^#define HAVE_AIRPDCAP 1
@@ -956,7 +993,6 @@ PCAP_DATALINK_NAME_TO_VAL_CONFIG=^#define HAVE_PCAP_DATALINK_NAME_TO_VAL 1
 PCAP_DATALINK_VAL_TO_NAME_CONFIG=^#define HAVE_PCAP_DATALINK_VAL_TO_NAME 1
 # PCAP_BREAKLOOP won't have any benefit on Win32, but breaks compatibility with 3.0
 PCAP_BREAKLOOP_CONFIG=
-WPCAP_CONSTIFIED_CONFIG=^#define WPCAP_CONSTIFIED 1
 !ELSE
 # no WpdPack installed
 WINPCAP_CONFIG=
@@ -964,7 +1000,6 @@ PCAP_FINDALLDEVS_CONFIG=
 PCAP_DATALINK_NAME_TO_VAL_CONFIG=
 PCAP_DATALINK_VAL_TO_NAME_CONFIG=
 PCAP_BREAKLOOP_CONFIG=
-WPCAP_CONSTIFIED=
 !ENDIF
 
 PCAP_LIST_DATALINKS_CONFIG=^#define HAVE_PCAP_LIST_DATALINKS 1
@@ -974,15 +1009,11 @@ PCAP_SET_DATALINK_CONFIG=^#define HAVE_PCAP_SET_DATALINK 1
 PCAP_HAVE_REMOTE_CONFIG=^#define HAVE_REMOTE 1
 PCAP_REMOTE_CONFIG=^#define HAVE_PCAP_REMOTE 1
 PCAP_OPEN_CONFIG=^#define HAVE_PCAP_OPEN 1
-PCAP_FINDALLDEVS_EX_CONFIG=^#define HAVE_PCAP_FINDALLDEVS_EX 1
-PCAP_CREATESRCSTR_CONFIG=^#define HAVE_PCAP_CREATESRCSTR 1
 PCAP_SETSAMPLING_CONFIG=^#define HAVE_PCAP_SETSAMPLING 1
 !ELSE
 PCAP_HAVE_REMOTE_CONFIG=
 PCAP_REMOTE_CONFIG=
 PCAP_OPEN_CONFIG=
-PCAP_FINDALLDEVS_EX_CONFIG=
-PCAP_CREATESRCSTR_CONFIG=
 PCAP_SETSAMPLING_CONFIG=
 !ENDIF
 
@@ -1027,7 +1058,7 @@ ADNS_CONFIG=
 
 !IFDEF KFW_DIR
 KFW_PATH=$(KFW_DIR)\bin
-KFW_CFLAGS=/I$(KFW_DIR)\inc
+KFW_CFLAGS=/I$(KFW_DIR)\include
 KFW_LIBS=$(KFW_DIR)\lib\krb5_32.lib
 # Nmake uses carets to escape special characters
 KFW_CONFIG=^#define HAVE_MIT_KERBEROS 1
@@ -1148,11 +1179,7 @@ LIBWIRESHARK_CONFIG=
 !ENDIF
 
 # Construct the path
-!IFDEF ICONV_DIR
-PATH=$(PATH);$(CYGWIN_PATH);$(GLIB_DIR)\bin;$(GETTEXT_DIR)\bin;$(ICONV_DIR)\bin;$(ZLIB_PATH);$(ADNS_PATH)
-!ELSE
 PATH=$(PATH);$(CYGWIN_PATH);$(GLIB_DIR)\bin;$(GETTEXT_DIR)\bin;$(ZLIB_PATH);$(ADNS_PATH)
-!ENDIF
 
 # We can't use a lot of IPv6 code with plain Visual C++ 6.0
 !IF "$(MSVC_VARIANT)" == "MSVC6" && !DEFINED(MSSDK)
@@ -1160,3 +1187,9 @@ INET6_CONFIG=
 !ELSE
 INET6_CONFIG=^#define INET6 1
 !ENDIF
+
+!IF "$(MSVC_VARIANT)" == "MSVC6" && !DEFINED(MSSDK)
+NTDDNDIS_CONFIG=
+!ELSE
+NTDDNDIS_CONFIG=^#define HAVE_NTDDNDIS_H 1
+!ENDIF