-# $Id: config.nmake,v 1.44 2003/06/14 20:35:55 guy Exp $
+# $Id: config.nmake,v 1.59 2003/09/08 03:13:14 gerald Exp $
-VERSION=0.9.13
+VERSION=0.9.15
#
# This should be comma-separated, not dot-separated, as per Graham
# Bloice's message in
# 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,9,13
+RC_VERSION=0,9,15
WTAP_VERSION=0.0
GTK_VERSION=1.3
-GLIB_VERSION=1.3
+GLIB_VERSION=2.0
+#
+# This presumes that GLib 1.3 developer's packages put header files and
+# libraries directly in a "glib" directory and GTK+ 1.3 packages put
+# header files and libraries directly in a "gtk+" directory, while GLib
+# 2.x developer's packages put header files in an "include\glib-{version}"
+# directory and libraries in a "lib\glib-{version}" directory, and GTK+
+# 2.x developer's packages put header files in an "include\gtk-{version}"
+# directory and libraries in a "lib\gtk-{version}" directory.
+#
+# If the version of a developer's package is 1.3, set the appropriate
+# _DIR variable to the "glib" or "gtk+" directory; if it's 2.x, set it
+# to the directory in which the "include" and "lib" directories reside.
+#
GLIB_DIR=C:\ethereal-win32-libs\glib
GTK_DIR=C:\ethereal-win32-libs\gtk+
-ZLIB_DIR=C:\ethereal-win32-libs\zlib-1.1.3
+
+ZLIB_DIR=C:\ethereal-win32-libs\zlib-114
PCAP_DIR=C:\ethereal-win32-libs\WPdpack
NET_SNMP_DIR=C:\ethereal-win32-libs\net-snmp-5.0.6
# send us the patches, along with details of why the change
# was necessary.
#
+!IF "$(GLIB_VERSION)" == "1.3"
GLIB_CFLAGS=/I$(GLIB_DIR) /I$(GLIB_DIR)\gmodule
-GTK_CFLAGS=/I$(GTK_DIR) /I$(GTK_DIR)\gdk /I$(GTK_DIR)\gdk\win32 $(GLIB_CFLAGS)
+GCC_GLIB_CFLAGS=-I$(GLIB_DIR) -I$(GLIB_DIR)\gmodule
+GLIB_LIBS=$(GLIB_DIR)\glib-$(GLIB_VERSION).lib \
+ $(GLIB_DIR)\gmodule\gmodule-$(GLIB_VERSION).lib
+!ELSE
+GLIB_CFLAGS=/I$(GLIB_DIR)\include\glib-$(GLIB_VERSION) \
+ /I$(GLIB_DIR)\lib\glib-$(GLIB_VERSION)\include
+GCC_GLIB_CFLAGS=-I$(GLIB_DIR)\include\glib-$(GLIB_VERSION) \
+ -I$(GLIB_DIR)\lib\glib-$(GLIB_VERSION)\include
+GLIB_LIBS=$(GLIB_DIR)\lib\glib-$(GLIB_VERSION).lib \
+ $(GLIB_DIR)\lib\gmodule-$(GLIB_VERSION).lib \
+ $(GLIB_DIR)\lib\gobject-$(GLIB_VERSION).lib
+!ENDIF
+
+!IF "$(GTK_VERSION)" == "1.3"
+!IF "$(GLIB_VERSION)" == "1.3"
+# GTK+ 1.3 with GLib 1.3
+GTK_CFLAGS=$(GLIB_CFLAGS) /I$(GTK_DIR) /I$(GTK_DIR)\gdk
+GTK_LIBS=$(GTK_DIR)\gtk\gtk-$(GTK_VERSION).lib \
+ $(GTK_DIR)\gdk\gdk-$(GTK_VERSION).lib \
+ $(GLIB_LIBS)
+!ELSE
+# GTK+ 1.3 with GLib 2.0
+GTK_CFLAGS=$(GLIB_CFLAGS) /I$(GTK_DIR)\include /I$(GTK_DIR)\include\gdk \
+ /I$(GTK_DIR)\lib\gtk+\include
+GTK_LIBS=$(GTK_DIR)\lib\gtk.lib \
+ $(GTK_DIR)\lib\gdk.lib \
+ $(GLIB_LIBS)
+!ENDIF
+!ELSE
+# GTK+ 2.x (with GLib 2.x)
+GTK_CFLAGS=$(GLIB_CFLAGS) /I$(GTK_DIR)\include\gtk-$(GTK_VERSION) \
+ /I$(GTK_DIR)\lib\gtk-$(GTK_VERSION)\include \
+ /I$(GTK_DIR)\include\atk-1.0 \
+ /I$(GTK_DIR)\include\pango-1.0
+GTK_LIBS=$(GTK_DIR)\lib\gtk-win32-$(GTK_VERSION).lib \
+ $(GTK_DIR)\lib\gdk-win32-$(GTK_VERSION).lib \
+ $(GTK_DIR)\lib\pango-1.0.lib \
+ $(GLIB_LIBS)
+!ENDIF
+
+!IFDEF ADNS_DIR
+ADNS_CFLAGS=/I$(ADNS_DIR)\src /I$(ADNS_DIR)\adns_win32
+ADNS_LIBS=$(ADNS_DIR)\adns_win32\lib\adns_dll.lib
+# Nmake uses carets to escape special characters
+ADNS_CONFIG=^#define HAVE_GNU_ADNS 1
+!else
+ADNS_CFLAGS=
+ADNS_LIBS=
+ADNS_CONFIG=
+!ENDIF