aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2003-12-10 23:21:52 +0000
committerGerald Combs <gerald@wireshark.org>2003-12-10 23:21:52 +0000
commit4f3287f27a8dd3890a56d69c69af1cbc03b45b18 (patch)
tree6f68c484f97afdc49a30e283e51c6c8da05bea86
parenta92bb0da45732fcdf60a54bbdd9810983ec065ae (diff)
Update the Windows environment to GLib 2.2.3 and GTK+ 1.3.0-20030717.
This requires replacing libintl-1.dll from the libintl package (which is no longer used) with intl.dll from intl.dll from the gettext package. svn path=/trunk/; revision=9239
-rw-r--r--README.win3218
-rw-r--r--packaging/nsis/ethereal.nsi4
2 files changed, 12 insertions, 10 deletions
diff --git a/README.win32 b/README.win32
index 93740a83d0..b40b9714d2 100644
--- a/README.win32
+++ b/README.win32
@@ -1,4 +1,4 @@
-$Id: README.win32,v 1.52 2003/12/07 00:04:31 gerald Exp $
+$Id: README.win32,v 1.53 2003/12/10 23:21:51 gerald Exp $
Installing Ethereal, Tethereal, and Editcap on Win32
====================================================
@@ -110,11 +110,11 @@ will reside in C:\Program Files\Ethereal\plugins\0.9.8
Yes, the location of plugins needs to be more flexible.
-Make sure the glib and gtk DLL's are in your path - i.e., that your path
-includes the directory (folder) or directories (folders) in which those
-DLLs are found - when you run Ethereal. This includes gtk-*.dll,
-glib-*.dll, gmodule-*.dll, gdk-*.dll, gnu-intl.dll, and iconv-*.dll.
-As of the 20000805 GTK+/GLIB distribution, gthread-*.dll is no longer needed.
+Make sure the glib and gtk DLL's are in your path - i.e., that your
+path includes the directory (folder) or directories (folders) in which
+those DLLs are found - when you run Ethereal. This includes gtk-*.dll,
+glib-*.dll, gmodule-*.dll, gdk-*.dll, intl.dll, and iconv-*.dll. As of
+the 20000805 GTK+/GLIB distribution, gthread-*.dll is no longer needed.
The Win32 Binary distribution, available from
@@ -147,7 +147,7 @@ or the mirror site at
Compiling the Ethereal distribution from source
===============================================
-You'll need the development packages for GLIB, GTK+, iconv, intl,
+You'll need the development packages for GLIB, GTK+, iconv, gettext,
WinPcap, zlib, Net-SNMP, ADNS, and PCRE. 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
@@ -173,11 +173,13 @@ package is as follows:
gtk+-1.3.0-20030216.zip C:\ethereal-win32-libs\gtk+
gtk+-dev-1.3.0-20030115.zip C:\ethereal-win32-libs\gtk+
libiconv-1.9.1.bin.woe32.zip C:\ethereal-win32-libs\gtk+
- libintl-0.10.40-tml-20020904.zip C:\ethereal-win32-libs\gtk+
+ gettext-runtime-0.13.bin.woe32.zip [ None ]
net-snmp-5.1.zip C:\ethereal-win32-libs
pcre-4.4.zip C:\ethereal-win32-libs
zlib121-dll.zip C:\ethereal-win32-libs\zlib121-dll
+The gettext runtime package provides intl.dll, which is needed by
+GLib 2.2.3.
Instructions for MS Visual C++
----------------------------
diff --git a/packaging/nsis/ethereal.nsi b/packaging/nsis/ethereal.nsi
index d8e3c7111a..f0b3ade375 100644
--- a/packaging/nsis/ethereal.nsi
+++ b/packaging/nsis/ethereal.nsi
@@ -1,7 +1,7 @@
;
; ethereal.nsi
;
-; $Id: ethereal.nsi,v 1.27 2003/12/10 19:05:06 ulfl Exp $
+; $Id: ethereal.nsi,v 1.28 2003/12/10 23:21:52 gerald Exp $
; ============================================================================
; Header configuration
@@ -81,7 +81,7 @@ File "${COMMON_FILES_GNU}\iconv.dll"
File "${COMMON_FILES_GNU}\libglib-2.0-0.dll"
File "${COMMON_FILES_GNU}\libgmodule-2.0-0.dll"
File "${COMMON_FILES_GNU}\libgobject-2.0-0.dll"
-File "${COMMON_FILES_GNU}\libintl-1.dll"
+File "${COMMON_FILES_GNU}\intl.dll"
!endif
File "${COMMON_FILES_GNU}\zlib1.dll"
File "${COMMON_FILES_GNU}\adns_dll.dll"