bugfix to a bug reported by Ian Schorr:
[obnox/wireshark/wip.git] / config.nmake
index 25ed04e5437c35eeedff3969d440fbfe7fe86638..10d92d1dd8640b36e815c02e3c6d05b69cb55fe5 100644 (file)
@@ -1,9 +1,9 @@
-# $Id: config.nmake,v 1.63 2003/11/11 18:25:04 guy Exp $
+# $Id: config.nmake,v 1.95 2004/07/07 19:15:46 gerald Exp $
 
-VERSION=0.9.16
+VERSION=0.10.5
 #
-# This should be comma-separated, not dot-separated, as per Graham
-# Bloice's message in
+# The RC_VERSION should be comma-separated, not dot-separated, 
+# as per Graham Bloice's message in
 #
 #      http://www.ethereal.com/lists/ethereal-dev/200303/msg00283.html
 #
@@ -12,8 +12,8 @@ VERSION=0.9.16
 # 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,16
-WTAP_VERSION=0.0
+RC_VERSION=0,10,5
+WTAP_VERSION=0.1
 
 #
 # If you're building with WinPcap 2.3, set WINPCAP_VERSION to 2.3; if
@@ -23,7 +23,13 @@ WTAP_VERSION=0.0
 # If you're not building with WinPcap at all, don't set it (comment
 # out or remove the line that sets it).
 #
-WINPCAP_VERSION=2.3
+WINPCAP_VERSION=3.0
+
+# 
+# Base directory, where your libraries reside, which needs to be 
+# compiling the sources. This is only inside this file.
+#
+ETHEREAL_LIBS=C:\ethereal-win32-libs
 
 #
 # Current versions of GTK+ 1.3 require GLib 2.0.  Earlier versions of
@@ -31,7 +37,7 @@ WINPCAP_VERSION=2.3
 # support them.  Upgrade to the current version.
 #
 GLIB_VERSION=2.0
-GLIB_DIR=C:\ethereal-win32-libs\glib
+GLIB_DIR=$(ETHEREAL_LIBS)\glib
 
 #
 # This presumes that GTK+ 1.3 packages put header files and libraries
@@ -39,13 +45,34 @@ GLIB_DIR=C:\ethereal-win32-libs\glib
 # put header files in an "include\gtk-{version}" directory and libraries
 # in a "lib\gtk-{version}" directory.
 #
-# If you're building with GTK+ 1.3, set GTK_VERSION to 1.3 and set
-# GTK_DIR to the pathname of the "gtk+" directory; if you're building
-# with GTK+ 2.x, set GTK_VERSION to 2.0 and set GTK_DIR to the pathname
-# of the directory in which the "include" and "lib" directories reside.
+# It's possible, to build both GTK version 1 and 2 at the same time,
+# or only one of the versions. GTK version 1 is currently recommended.
+# 
+# If you want building with GTK+ 1.3, set GTK1_DIR to the pathname of the 
+# "gtk+" directory; if you want building with GTK+ 2.x, set GTK2_DIR to 
+# the pathname of the directory in which the "include" and "lib" directories 
+# reside.
+#
+GTK1_DIR=$(ETHEREAL_LIBS)\gtk+
+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.
 #
-GTK_VERSION=1.3
-GTK_DIR=C:\ethereal-win32-libs\gtk+
+#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
+# which the files are stored.
+#
+# 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
 
 #
 # If you have Zlib, set this to the pathname of the directory in
@@ -54,10 +81,19 @@ GTK_DIR=C:\ethereal-win32-libs\gtk+
 # If you don't have Zlib, comment this line out, so that Zlib isn't
 # defined.
 #
-ZLIB_DIR=C:\ethereal-win32-libs\zlib-114
+ZLIB_DIR=$(ETHEREAL_LIBS)\zlib121-dll
 
-PCAP_DIR=C:\ethereal-win32-libs\WPdpack
-NET_SNMP_DIR=C:\ethereal-win32-libs\net-snmp-5.0.6
+#
+# Set PCAP_DIR to the pathname of the directory in which the WinPcap
+# developer's pack resides
+#
+PCAP_DIR=$(ETHEREAL_LIBS)\WPdpack
+
+#
+# Set NET_SNMP_DIR to the pathname of the directory in which the
+# Net-SNMP include files and library resides.
+#
+NET_SNMP_DIR=$(ETHEREAL_LIBS)\net-snmp-5.1
 
 #
 # If you have GNU ADNS, set this to the pathname of the directory in
@@ -66,24 +102,53 @@ NET_SNMP_DIR=C:\ethereal-win32-libs\net-snmp-5.0.6
 # If you don't have GNU ADNS, comment this line out, so that ADNS_DIR
 # isn't defined.
 #
-ADNS_DIR=C:\ethereal-win32-libs\adns-1.0-win32-01
+ADNS_DIR=$(ETHEREAL_LIBS)\adns-1.0-win32-03
+
+#
+# If you have the PCRE (Perl Compatible Regular Expressions) library,
+# set this to the pathname of the directory in which the GNUWIN32
+# pcre-lib package has been extracted.
+#
+# If you don't have PCRE, comment this line out, so that PCRE_DIR
+# isn't defined.
+#
+PCRE_DIR=$(ETHEREAL_LIBS)\pcre-4.4
+
+#
+# Set ICONV_DIR to the pathname of the directory in which the
+# ICONV include files and library resides.
+#
+ICONV_DIR=$(ETHEREAL_LIBS)\libiconv-1.9.1.bin.woe32
+
+#
+# Set GETTEXT_DIR to the pathname of the directory in which the
+# GETTEXT include files and library resides.
+#
+GETTEXT_DIR=$(ETHEREAL_LIBS)\gettext-runtime-0.13.1
 
-COMMON_FILES_GNU=c:\program files\common files\gnu
+# Compiler flags
+# /W3  warning level 3 (0 less - 4 most, 1 default)
+# /Zi  create .pdb file for debugging
+LOCAL_CFLAGS=/Zi /W3
 
-LOCAL_CFLAGS=-Zi
+# Linker flags
+# /DEBUG generate debug info
 LOCAL_LDFLAGS=/DEBUG
 
 # Set PDB_FILE according to your VC++ version 
 PDB_FILE=vc*.pdb
 
 # Set path if you need to find some binary
-PATH=c:\cygnus\cygwin-b20\H-i586-cygwin32\bin;c:\python22;c:\ethereal\wiretap;$(COMMON_FILES_GNU);$(PATH)
+PATH=c:\cygwin\bin;c:\python23;$(PATH)
+
+# Set path to some required DLLs
+PATH=$(GLIB_DIR)\bin;$(GETTEXT_DIR)\bin;$(ICONV_DIR)\bin;$(PATH)
 
 SH=bash
 PERL=perl
-POD2MAN=pod2man
-POD2HTML=pod2html
-PYTHON="C:/python22/python.exe"
+POD2MAN=$(SH) pod2man
+POD2HTML=$(SH) pod2html
+PYTHON="C:/python23/python.exe"
 LEX=flex
 YACC=bison
 
@@ -93,6 +158,44 @@ YACC=bison
 # To build the installer
 MAKENSIS="C:/program files/nsis/makensis.exe"
 
+# Choose modern style user interface for the installer.
+# When using this, make sure you have a supported NSIS
+# version installed. See "packaging\nsis\ethereal.nsi" for details.
+#
+# If you don't want the modern UI (or don't have a recent NSIS version),
+# comment this line out, so that MAKENSIS_MODERN_UI isn't defined.
+#
+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
+
 #
 # You should not have to change anything below this comment.
 # If you do, it's a deficiency in the Makefile.nmake files;
@@ -110,24 +213,23 @@ GLIB_LIBS=$(GLIB_DIR)\lib\glib-$(GLIB_VERSION).lib \
        $(GLIB_DIR)\lib\gmodule-$(GLIB_VERSION).lib \
        $(GLIB_DIR)\lib\gobject-$(GLIB_VERSION).lib
 
-!IF "$(GTK_VERSION)" == "1.3"
 # GTK+ 1.3
-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 \
+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 \
+       $(GTK1_DIR)\lib\gdk.lib \
        $(GLIB_LIBS)
-!ELSE
+
 # GTK+ 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 \
+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-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)
-!ENDIF
 
 !IFDEF WINPCAP_VERSION
 # Nmake uses carets to escape special characters
@@ -146,8 +248,9 @@ WPCAP_CONSTIFIED=
 !ENDIF
 
 !IFDEF ZLIB_DIR
-ZLIB_CFLAGS=/I$(ZLIB_DIR)
-ZLIB_LIBS=$(ZLIB_DIR)\zlib.lib
+PATH=$(ZLIB_DIR);$(PATH)
+ZLIB_CFLAGS=/I$(ZLIB_DIR)\include
+ZLIB_LIBS=$(ZLIB_DIR)\lib\zdll.lib
 # Nmake uses carets to escape special characters
 ZLIB_CONFIG=^#define HAVE_LIBZ 1
 !else
@@ -157,6 +260,7 @@ ZLIB_CONFIG=
 !ENDIF
 
 !IFDEF ADNS_DIR
+PATH=$(ADNS_DIR)\adns_win32\lib;$(PATH)
 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
@@ -166,3 +270,21 @@ ADNS_CFLAGS=
 ADNS_LIBS=
 ADNS_CONFIG=
 !ENDIF
+
+!IFDEF PCRE_DIR
+PATH=$(PCRE_DIR)\bin;$(PATH)
+PCRE_CFLAGS=/I$(PCRE_DIR)\include
+PCRE_LIBS=$(PCRE_DIR)\lib\pcre.lib
+# Nmake uses carets to escape special characters
+PCRE_CONFIG=^#define HAVE_LIBPCRE 1
+!else
+PCRE_CFLAGS=
+PCRE_LIBS=
+PCRE_CONFIG=
+!ENDIF
+
+!IFDEF ENABLE_LIBETHEREAL
+LIBETHEREAL_CONFIG=^#define HAVE_LIBETHEREALDLL 1
+!ELSE
+LIBETHEREAL_CONFIG=
+!ENDIF