modify the tool tip "Nodes in the diagram are identified with network source and...

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

diff --git a/config.nmake b/config.nmake
index ab4105af488d2b45842f8e1249f7eb9a5e45412a..1d6a57b6b856844e1f8be2a3f3dd4e75d215c2e6 100644 (file)
--- a/config.nmake
+++ b/config.nmake
@@ -81,11 +81,12 @@ GTK2_DIR=$(ETHEREAL_LIBS)\gtk2
 #PANGO_INST_VERSION=1.2
 #GTK2_INST_VERSION=2.4
 #PANGO_INST_VERSION=1.4
-# Support for GTK 2.6 and 2.8 is currently very experimental ...
-#GTK2_INST_VERSION=2.6
-#PANGO_INST_VERSION=1.8
-GTK2_INST_VERSION=2.8
-PANGO_INST_VERSION=1.10
+# GTK 2.6 is the mainline since Ethereal 0.10.14
+GTK2_INST_VERSION=2.6
+PANGO_INST_VERSION=1.8
+# Support for GTK 2.8 is currently experimental ...
+#GTK2_INST_VERSION=2.8
+#PANGO_INST_VERSION=1.10
 
 #
 # If you have GTK-Wimp, set this to the pathname of the directory in
@@ -94,7 +95,11 @@ PANGO_INST_VERSION=1.10
 # If you don't have GTK-Wimp, comment this line out, so that GTK-Wimp isn't
 # defined.
 #
+# Please note: GTK 2.8 (and later?) includes GTK-Wimp
+# (in this case these GTK-Wimp related settings will have no effect)
+#
 GTK_WIMP_DIR=$(ETHEREAL_LIBS)\gtk-wimp
+GTK_THEME_DIR=$(GTK_WIMP_DIR)\Theme\gtk-2.0
 
 #
 # If you have Zlib, set this to the pathname of the directory in
@@ -299,6 +304,9 @@ GTK2_LIBS=$(GTK2_DIR)\lib\gtk-win32-2.0.lib \
 !IF "$(GTK2_INST_VERSION)" == "2.8"
 GTK2_LIB_DIR=2.4.0
 NEED_LIBPNG_DLL=USE
+NEED_CAIRO_DLL=USE
+GTK_WIMP_DIR=$(GTK2_DIR)\lib\gtk-2.0\$(GTK2_LIB_DIR)\engines
+GTK_THEME_DIR=$(GTK2_DIR)\share\themes\MS-Windows\gtk-2.0
 !ELSEIF "$(GTK2_INST_VERSION)" == "2.6"
 GTK2_LIB_DIR=2.4.0
 !ELSEIF "$(GTK2_INST_VERSION)" == "2.4"