aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2003-08-04 14:34:17 +0000
committerGerald Combs <gerald@wireshark.org>2003-08-04 14:34:17 +0000
commitddd408ad2f3b29b272b9234476aa19c89973611b (patch)
treea8913bca614becd22aa0cd4d91f6ddf02498351b
parent0f9b1a04582737bb3e73f27f8da81ff57ba25455 (diff)
Build with Glib 2.0 and GTK+ 1.3 by default. Don't build with zlib 1.13.
Add minor updates to README.win32. svn path=/trunk/; revision=8126
-rw-r--r--README.win3216
-rw-r--r--config.nmake6
2 files changed, 11 insertions, 11 deletions
diff --git a/README.win32 b/README.win32
index 135855934a..0411077150 100644
--- a/README.win32
+++ b/README.win32
@@ -1,4 +1,4 @@
-$Id: README.win32,v 1.46 2003/06/02 18:40:00 gerald Exp $
+$Id: README.win32,v 1.47 2003/08/04 14:34:17 gerald Exp $
Installing Ethereal, Tethereal, and Editcap on Win32
====================================================
@@ -147,14 +147,14 @@ or the mirror site at
Compiling the Ethereal distribution from source
===============================================
-You'll need the development packages for GLIB, GTK+, WinPcap, zlib,
-Net-SNMP, and ADNS. The GLIB, GTK+, and WinPcap packages are available
-from the respctive home pages for each project (the same URLs as listed
-above). The development packages contain header files and stub libaries
-to link against. Precompiled zlib, Net-SNMP, and ADNS packages are
-available at
+You'll need the development packages for GLIB, GTK+, iconv, intl,
+WinPcap, zlib, Net-SNMP, and ADNS. The GLIB, GTK+, and WinPcap packages
+are available from the respctive home pages for each project (the same
+URLs as listed above). The development packages contain header files and
+stub libaries to link against. Precompiled versions of these packages
+are available at
- http://www.ethereal.com/distribution/win32/
+ http://www.ethereal.com/distribution/win32/development/
The ADNS package is also available at its homepage:
diff --git a/config.nmake b/config.nmake
index c2d0bff0fc..45dfa7da4c 100644
--- a/config.nmake
+++ b/config.nmake
@@ -1,4 +1,4 @@
-# $Id: config.nmake,v 1.55 2003/08/04 08:10:33 guy Exp $
+# $Id: config.nmake,v 1.56 2003/08/04 14:34:16 gerald Exp $
VERSION=0.9.14
#
@@ -16,7 +16,7 @@ RC_VERSION=0,9,14
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
PCAP_DIR=C:\ethereal-win32-libs\WPdpack
NET_SNMP_DIR=C:\ethereal-win32-libs\net-snmp-5.0.6