bugfix to a bug reported by Ian Schorr:

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

diff --git a/config.nmake b/config.nmake
index 864c42fc509dec4428ca86a3bfd3f6f9e73db39d..10d92d1dd8640b36e815c02e3c6d05b69cb55fe5 100644 (file)
--- a/config.nmake
+++ b/config.nmake
@@ -1,6 +1,6 @@
-# $Id: config.nmake,v 1.92 2004/06/04 17:31:11 ulfl Exp $
+# $Id: config.nmake,v 1.95 2004/07/07 19:15:46 gerald Exp $
 
-VERSION=0.10.4
+VERSION=0.10.5
 #
 # The RC_VERSION should be comma-separated, not dot-separated, 
 # as per Graham Bloice's message in
@@ -12,7 +12,7 @@ VERSION=0.10.4
 # number to be correctly displayed in the explorer properties dialog
 # for the executables, and XP's tooltip, rather than 0.0.0.0."
 #
-RC_VERSION=0,10,4
+RC_VERSION=0,10,5
 WTAP_VERSION=0.1
 
 #
@@ -54,14 +54,16 @@ GLIB_DIR=$(ETHEREAL_LIBS)\glib
 # reside.
 #
 GTK1_DIR=$(ETHEREAL_LIBS)\gtk+
-#GTK2_DIR=$(ETHEREAL_LIBS)\gtk2
+GTK2_DIR=$(ETHEREAL_LIBS)\gtk2
 
 # Declare the version of your gtk2 and pango. (MAJOR + MINOR Version number
 # but without MICRO version number) 
-# These macros are used by the nsis installer script.
+# These macros are used by the nsis installer script and by the setup target.
 #
-GTK2_INST_VERSION=2.2
-PANGO_INST_VERSION=1.2
+#GTK2_INST_VERSION=2.2
+#PANGO_INST_VERSION=1.2
+GTK2_INST_VERSION=2.4
+PANGO_INST_VERSION=1.4
 
 #
 # If you have GTK-Wimp, set this to the pathname of the directory in
@@ -70,7 +72,7 @@ PANGO_INST_VERSION=1.2
 # If you don't have GTK-Wimp, comment this line out, so that GTK-Wimp isn't
 # defined.
 #
-#GTK_WIMP_DIR=$(ETHEREAL_LIBS)\gtk-wimp
+GTK_WIMP_DIR=$(ETHEREAL_LIBS)\gtk-wimp
 
 #
 # If you have Zlib, set this to the pathname of the directory in