Don't use PCRE if we have GRegex.

[obnox/wireshark/wip.git] / config.nmake

diff --git a/config.nmake b/config.nmake
index 9f443cb5a0def71966daf73d7c375c118c177bbd..a7ccabc7f92180466113d93ebd67b0ef4fd01823 100644 (file)
--- a/config.nmake
+++ b/config.nmake
@@ -16,7 +16,7 @@ WIRESHARK_TARGET_PLATFORM=win32
 # It's highly recommended to leave MAJOR/MINOR/MICRO unchanged
 VERSION_MAJOR=1
 VERSION_MINOR=3
-VERSION_MICRO=3
+VERSION_MICRO=4
 VERSION_BUILD=0
 # It's recommended to change VERSION_EXTRA for your own custom builds
 # e.g. "-SVN-12345"
@@ -167,8 +167,7 @@ GTK_PKG=2.18.5-20091215
 # (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.16
+GTK_INST_VERSION=2.18
 
 #
 # Optional: WinPcap developer's pack to capture network traffic.
@@ -263,7 +262,7 @@ GNUTLS_PKG=2.8.5-4.12
 # If you don't have KFW, comment this line out, so that KFW_DIR
 # isn't defined.
 #
-KFW_DIR=$(WIRESHARK_LIBS)\kfw-3.2.2-ws1
+KFW_DIR=$(WIRESHARK_LIBS)\kfw-3-2-2-i386-ws-vc6
 
 #
 # Optional: the Nettle library enables ??? decryption.