# in the file README.win32.
# The current Ethereal version
-VERSION=0.10.11
+VERSION=0.10.13
#
# The RC_VERSION should be comma-separated, not dot-separated,
# 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,11
+RC_VERSION=0,10,13
# The version of the wiretap library
-WTAP_VERSION=0.1
-RC_WTAP_VERSION=0,1
+WTAP_VERSION=0.3
+RC_WTAP_VERSION=0,3
#
# If you're building with WinPcap 2.3, set WINPCAP_VERSION to 2.3; if
# you're building with WinPcap 3.0, set it to 3.0; if you're building
-# with WinPcap 3.1 alpha, set it to 3.1.
+# with WinPcap 3.1, set it to 3.1.
#
# 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.
+# (currently unused)
+#
+# If you don't have the User's Guide, comment this line out, so that
+# ETHEREAL_EUG_DIR isn't defined.
+#
+#ETHEREAL_EUG_DIR=docbook/eug_html_chunked
#
# Base directory, where your libraries reside, which needs to be
#
#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
# 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
# If you don't have Zlib, comment this line out, so that Zlib isn't
# defined.
#
-ZLIB_DIR=$(ETHEREAL_LIBS)\zlib122-dll
+ZLIB_DIR=$(ETHEREAL_LIBS)\zlib123-dll
#
# Set PCAP_DIR to the pathname of the directory in which the WinPcap
# 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,
# If you don't have PCRE, comment this line out, so that PCRE_DIR
# isn't defined.
#
-PCRE_DIR=$(ETHEREAL_LIBS)\pcre-4.4
+PCRE_DIR=$(ETHEREAL_LIBS)\pcre-6.4
#
# If you have the Nettle encryption library, set this to the pathname
LOCAL_CFLAGS=/Zi /W3
# Linker flags
-# /DEBUG generate debug info
+# /DEBUG generate debug info
+# /PROFILE generate map file(s) for profiling
LOCAL_LDFLAGS=/DEBUG
# Set PDB_FILE according to your VC++ version
PDB_FILE=vc*.pdb
-# add cygwin binaries to the path
-PATH=$(PATH);c:\cygwin\bin
+# Set up the path to the cygwin binaries
+CYGWIN_PATH=c:\cygwin\bin
-# add some required DLLs to the path
-PATH=$(GLIB_DIR)\bin;$(GETTEXT_DIR)\bin;$(ICONV_DIR)\bin;$(PATH)
+# Set up the path to some required DLLs
+DLL_PATH=$(GLIB_DIR)\bin;$(GETTEXT_DIR)\bin;$(ICONV_DIR)\bin
# Set the following commands to find the tools.
#
#HHC="C:/Program Files/HTML Help Workshop/hhc.exe"
+# 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.
+# 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)
ENABLE_LIBETHEREAL=USE
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 \
$(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
!ENDIF
!IFDEF ZLIB_DIR
-PATH=$(ZLIB_DIR);$(PATH)
+ZLIB_PATH=$(ZLIB_DIR)
ZLIB_CFLAGS=/I$(ZLIB_DIR)\include
ZLIB_LIBS=$(ZLIB_DIR)\lib\zdll.lib
# Nmake uses carets to escape special characters
!ENDIF
!IFDEF ADNS_DIR
-PATH=$(ADNS_DIR)\adns_win32\lib;$(PATH)
+ADNS_PATH=$(ADNS_DIR)\adns_win32\lib
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
!ENDIF
!IFDEF PCRE_DIR
-PATH=$(PCRE_DIR)\bin;$(PATH)
+PCRE_PATH=$(PCRE_DIR)\bin
PCRE_CFLAGS=/I$(PCRE_DIR)\include
PCRE_LIBS=$(PCRE_DIR)\lib\pcre.lib
# Nmake uses carets to escape special characters
!ELSE
LIBETHEREAL_CONFIG=
!ENDIF
+
+# Construct the path
+PATH=$(PATH);$(CYGWIN_PATH);$(DLL_PATH);$(ZLIB_PATH);$(ADNS_PATH)
git.samba.org / obnox / wireshark / wip.git / blobdiff