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 bd16475a764c6d9a774791ed4a7bc529696053e8..1d6a57b6b856844e1f8be2a3f3dd4e75d215c2e6 100644 (file)
--- a/config.nmake
+++ b/config.nmake
@@ -4,7 +4,7 @@
 # in the file README.win32.
 
 # The current Ethereal version
-VERSION=0.10.12
+VERSION=0.10.13
 
 #
 # The RC_VERSION should be comma-separated, not dot-separated, 
@@ -17,7 +17,7 @@ VERSION=0.10.12
 # 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,12
+RC_VERSION=0,10,13
 
 # The version of the wiretap library
 WTAP_VERSION=0.3
@@ -31,7 +31,7 @@ RC_WTAP_VERSION=0,3
 # If you're not building with WinPcap at all, don't set it (comment
 # out or remove the line that sets it).
 #
-WINPCAP_VERSION=3.0
+WINPCAP_VERSION=3.1
 
 # 
 # Directory, where your User's Guide reside, relative to the source dir.
@@ -79,8 +79,14 @@ GTK2_DIR=$(ETHEREAL_LIBS)\gtk2
 #
 #GTK2_INST_VERSION=2.2
 #PANGO_INST_VERSION=1.2
-GTK2_INST_VERSION=2.4
-PANGO_INST_VERSION=1.4
+#GTK2_INST_VERSION=2.4
+#PANGO_INST_VERSION=1.4
+# 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
@@ -89,7 +95,11 @@ PANGO_INST_VERSION=1.4
 # 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
@@ -119,7 +129,7 @@ NET_SNMP_DIR=$(ETHEREAL_LIBS)\net-snmp-5.2.1.2
 # If you don't have GNU ADNS, comment this line out, so that ADNS_DIR
 # isn't defined.
 #
-ADNS_DIR=$(ETHEREAL_LIBS)\adns-1.0-win32-04
+ADNS_DIR=$(ETHEREAL_LIBS)\adns-1.0-win32-05
 
 #
 # If you have the PCRE (Perl Compatible Regular Expressions) library,
@@ -129,7 +139,7 @@ ADNS_DIR=$(ETHEREAL_LIBS)\adns-1.0-win32-04
 # If you don't have PCRE, comment this line out, so that PCRE_DIR
 # isn't defined.
 #
-PCRE_DIR=$(ETHEREAL_LIBS)\pcre-6.3
+PCRE_DIR=$(ETHEREAL_LIBS)\pcre-6.4
 
 #
 # If you have the Nettle encryption library, set this to the pathname
@@ -240,7 +250,10 @@ MAKENSIS_MODERN_UI=USE
 # According to http://bugs.ethereal.com/bugzilla/show_bug.cgi?id=403
 # XCOPY under Windows NT doesn't support the "/Y" flag.  This works
 # around that bug.
-COPYCMD=/Y
+# XXX - This apparently doesn't work for some versions of nmake:
+# http://support.microsoft.com/default.aspx?scid=kb;en-us;86814
+# It looks like we'll have to call "set copycmd=/y" before we run xcopy.
+COPYCMD=/y
 
 # If you don't want to build libethereal.dll, you should comment out the
 # following line. (Note: for plugin support this option must stay activated)
@@ -279,6 +292,7 @@ GTK1_LIBS=$(GTK1_DIR)\lib\gtk.lib \
 GTK2_CFLAGS=$(GLIB_CFLAGS) /I$(GTK2_DIR)\include\gtk-2.0 \
        /I$(GTK2_DIR)\lib\gtk-2.0\include \
        /I$(GTK2_DIR)\include\atk-1.0 \
+       /I$(GTK2_DIR)\include\cairo \
        /I$(GTK2_DIR)\include\pango-1.0
 GTK2_LIBS=$(GTK2_DIR)\lib\gtk-win32-2.0.lib \
        $(GTK2_DIR)\lib\gdk-win32-2.0.lib \
@@ -286,6 +300,33 @@ GTK2_LIBS=$(GTK2_DIR)\lib\gtk-win32-2.0.lib \
        $(GTK2_DIR)\lib\pango-1.0.lib \
        $(GLIB_LIBS)
 
+# the lib dir of GTK2.6 didn't changed since 2.4.0
+!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"
+GTK2_LIB_DIR=2.4.0
+!ELSEIF "$(GTK2_INST_VERSION)" == "2.2"
+GTK2_LIB_DIR=2.2.0
+!ENDIF
+
+# the lib dir of PANGO1.8 didn't changed since 1.4.0
+!IF "$(PANGO_INST_VERSION)" == "1.10"
+PANGO_LIB_DIR=1.4.0
+!ELSEIF "$(PANGO_INST_VERSION)" == "1.8"
+PANGO_LIB_DIR=1.4.0
+!ELSEIF "$(PANGO_INST_VERSION)" == "1.4"
+PANGO_LIB_DIR=1.4.0
+!ELSEIF "$(PANGO_INST_VERSION)" == "1.2"
+PANGO_LIB_DIR=1.2.0
+!ENDIF
+
+
 !IFDEF WINPCAP_VERSION
 # Nmake uses carets to escape special characters
 WINPCAP_CONFIG=^#define HAVE_LIBPCAP 1
@@ -361,4 +402,4 @@ LIBETHEREAL_CONFIG=
 !ENDIF
 
 # Construct the path
-PATH=$(PATH);$(CYGWIN_PATH);$(DLL_PATH);$(ZLIB_PATH);$(ADNS_PATH)
\ No newline at end of file
+PATH=$(PATH);$(CYGWIN_PATH);$(DLL_PATH);$(ZLIB_PATH);$(ADNS_PATH)