Fix document creation under Windows, add ethereal-filter.html to the NSIS

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

diff --git a/config.nmake b/config.nmake
index 96c5e938dac4e739ec07ffa9255253c76e14b971..df85ec92f5e14bc9dc70b50cdc9a9251defd4cdb 100644 (file)
--- a/config.nmake
+++ b/config.nmake
@@ -1,6 +1,6 @@
-# $Id: config.nmake,v 1.50 2003/06/17 05:38:24 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
@@ -12,11 +12,11 @@ VERSION=0.9.13
 # 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
@@ -34,7 +34,7 @@ GLIB_VERSION=1.3
 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
 
@@ -83,21 +83,36 @@ MAKENSIS="C:/program files/nsis/makensis.exe"
 #
 !IF "$(GLIB_VERSION)" == "1.3"
 GLIB_CFLAGS=/I$(GLIB_DIR) /I$(GLIB_DIR)\gmodule
+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 \
@@ -111,7 +126,8 @@ GTK_LIBS=$(GTK_DIR)\lib\gtk-win32-$(GTK_VERSION).lib \
 !IFDEF ADNS_DIR
 ADNS_CFLAGS=/I$(ADNS_DIR)\src /I$(ADNS_DIR)\adns_win32
 ADNS_LIBS=$(ADNS_DIR)\adns_win32\lib\adns_dll.lib
-ADNS_CONFIG="#define HAVE_GNU_ADNS 1"
+# Nmake uses carets to escape special characters
+ADNS_CONFIG=^#define HAVE_GNU_ADNS 1
 !else
 ADNS_CFLAGS=
 ADNS_LIBS=