summaryrefslogtreecommitdiff
path: root/config.nmake
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2004-07-07 19:15:46 +0000
committerGerald Combs <gerald@wireshark.org>2004-07-07 19:15:46 +0000
commita3545d4b9f7ab91dbd43f375e5b25b1c95f86976 (patch)
tree143f63c29b1831ad92efaf616d4e26e9c0c15103 /config.nmake
parent76c2bec3ca1fb061ad60f4a3455906421d18a680 (diff)
downloadwireshark-a3545d4b9f7ab91dbd43f375e5b25b1c95f86976.tar.gz
Enable GTK_WIMP and GTK2 by default. Make GTK2 2.4 and Pango 1.4 the default
versions. svn path=/trunk/; revision=11335
Diffstat (limited to 'config.nmake')
-rw-r--r--config.nmake14
1 files changed, 7 insertions, 7 deletions
diff --git a/config.nmake b/config.nmake
index 7416e75fa2..10d92d1dd8 100644
--- a/config.nmake
+++ b/config.nmake
@@ -1,4 +1,4 @@
-# $Id: config.nmake,v 1.94 2004/07/06 16:29:18 gerald Exp $
+# $Id: config.nmake,v 1.95 2004/07/07 19:15:46 gerald Exp $
VERSION=0.10.5
#
@@ -54,16 +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 and by the setup target.
#
-GTK2_INST_VERSION=2.2
-PANGO_INST_VERSION=1.2
-#GTK2_INST_VERSION=2.4
-#PANGO_INST_VERSION=1.4
+#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
@@ -72,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