bugfix to a bug reported by Ian Schorr:

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

diff --git a/config.nmake b/config.nmake
index afb47cd43127825ca60dd1f3cc6ad81522cb42a0..10d92d1dd8640b36e815c02e3c6d05b69cb55fe5 100644 (file)
--- a/config.nmake
+++ b/config.nmake
@@ -1,6 +1,6 @@
-# $Id: config.nmake,v 1.86 2004/05/09 10:03:36 guy Exp $
+# $Id: config.nmake,v 1.95 2004/07/07 19:15:46 gerald Exp $
 
-VERSION=0.10.3
+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.3
 # 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,3
+RC_VERSION=0,10,5
 WTAP_VERSION=0.1
 
 #
@@ -54,7 +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
 
 #
 # If you have GTK-Wimp, set this to the pathname of the directory in
@@ -63,7 +72,7 @@ GTK1_DIR=$(ETHEREAL_LIBS)\gtk+
 # 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
@@ -158,6 +167,32 @@ MAKENSIS="C:/program files/nsis/makensis.exe"
 #
 MAKENSIS_MODERN_UI=USE
 
+# To build the developers documentation with doxygen and dot.
+# Currently experimental only.
+# You will have to download and install:
+#
+# Doxygen from: www.doxygen.org
+# Graphviz from: http://www.research.att.com/sw/tools/graphviz/
+#
+# If you don't want the developers documentation (or don't have the tools),
+# comment this line out, so that DOXYGEN isn't defined.
+#
+#DOXYGEN="C:/program files/doxygen/bin/doxygen.exe"
+
+# To build compressed html help format .chm from doxygen output.
+# Currently experimental only.
+# You will have to download and install the html help compiler from:
+#
+# http://msdn.microsoft.com/library/default.asp?url=/library/en-us/htmlhelp/html
+# /hwMicrosoftHTMLHelpDownloads.asp 
+#
+# Then point HHC to the html help compiler exe.
+#
+# The .chm file(s) are not generated by default. You will have to generate the 
+# file(s) by calling the Makefile.nmake's target doxygen.chm in the submodules (epan/gk/...).
+#
+#HHC="C:/Program Files/HTML Help Workshop/hhc.exe"
+
 # If you wan't to build a libethereal.dll, you should comment out the following line
 #ENABLE_LIBETHEREAL=USE
 
@@ -179,7 +214,6 @@ GLIB_LIBS=$(GLIB_DIR)\lib\glib-$(GLIB_VERSION).lib \
        $(GLIB_DIR)\lib\gobject-$(GLIB_VERSION).lib
 
 # GTK+ 1.3
-GTK1_VERSION=1.3
 GTK1_CFLAGS=$(GLIB_CFLAGS) /I$(GTK1_DIR)\include /I$(GTK1_DIR)\include\gdk \
        /I$(GTK1_DIR)\lib\gtk+\include
 GTK1_LIBS=$(GTK1_DIR)\lib\gtk.lib \
@@ -187,18 +221,16 @@ GTK1_LIBS=$(GTK1_DIR)\lib\gtk.lib \
        $(GLIB_LIBS)
 
 # GTK+ 2.x
-GTK2_VERSION=2.0
-GTK2_CFLAGS=$(GLIB_CFLAGS) /I$(GTK2_DIR)\include\gtk-$(GTK2_VERSION) \
-       /I$(GTK2_DIR)\lib\gtk-$(GTK2_VERSION)\include \
+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\pango-1.0
-GTK2_LIBS=$(GTK2_DIR)\lib\gtk-win32-$(GTK2_VERSION).lib \
-       $(GTK2_DIR)\lib\gdk-win32-$(GTK2_VERSION).lib \
-       $(GTK2_DIR)\lib\gdk_pixbuf-$(GTK2_VERSION).lib \
+GTK2_LIBS=$(GTK2_DIR)\lib\gtk-win32-2.0.lib \
+       $(GTK2_DIR)\lib\gdk-win32-2.0.lib \
+       $(GTK2_DIR)\lib\gdk_pixbuf-2.0.lib \
        $(GTK2_DIR)\lib\pango-1.0.lib \
        $(GLIB_LIBS)
 
-
 !IFDEF WINPCAP_VERSION
 # Nmake uses carets to escape special characters
 WINPCAP_CONFIG=^#define HAVE_LIBPCAP 1