diff options
| -rw-r--r-- | Makefile.nmake | 9 | ||||
| -rw-r--r-- | README.win32 | 15 | ||||
| -rw-r--r-- | config.h.win32 | 6 | ||||
| -rw-r--r-- | config.nmake | 3 | ||||
| -rw-r--r-- | epan/Makefile.nmake | 3 | ||||
| -rw-r--r-- | epan/config.h.win32 | 6 | ||||
| -rw-r--r-- | packaging/nsis/ethereal.nsi | 3 |
7 files changed, 32 insertions, 13 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 5f01c4ef42..4eb2741f50 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -1,7 +1,7 @@ ## Makefile for building ethereal.exe with Microsoft C and nmake ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake,v 1.300 2003/05/29 17:59:51 guy Exp $ +# $Id: Makefile.nmake,v 1.301 2003/06/02 18:40:00 gerald Exp $ include config.nmake include <win32.mak> @@ -17,6 +17,7 @@ CFLAGS=-DHAVE_CONFIG_H $(LOCAL_CFLAGS) /I$(GLIB_DIR) /I$(GLIB_DIR)\gmodule \ /I$(GTK_DIR) /I. /Iwiretap /I$(GTK_DIR)\gdk /I$(GTK_DIR)\gdk\win32 \ /I$(ZLIB_DIR) /I$(PCAP_DIR)\include \ /I$(NET_SNMP_DIR)\include /I$(NET_SNMP_DIR)\win32 \ + /I$(ADNS_DIR)\src /I$(ADNS_DIR)\adns_win32 \ -D_U_="" CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL @@ -450,7 +451,8 @@ ethereal_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ $(GTK_DIR)\gdk\gdk-$(GTK_VERSION).lib \ $(GLIB_DIR)\glib-$(GLIB_VERSION).lib \ $(GLIB_DIR)\gmodule\gmodule-$(GLIB_VERSION).lib \ - $(NET_SNMP_DIR)\win32\lib\libsnmp.lib + $(NET_SNMP_DIR)\win32\lib\libsnmp.lib \ + $(ADNS_DIR)\adns_win32\lib\adns_dll.lib # $(PCAP_DIR)\lib\wpcap.lib tethereal_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ @@ -459,7 +461,8 @@ tethereal_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ wsock32.lib user32.lib \ $(GLIB_DIR)\glib-$(GLIB_VERSION).lib \ $(GLIB_DIR)\gmodule\gmodule-$(GLIB_VERSION).lib \ - $(NET_SNMP_DIR)\win32\lib\libsnmp.lib + $(NET_SNMP_DIR)\win32\lib\libsnmp.lib \ + $(ADNS_DIR)\adns_win32\lib\adns_dll.lib editcap_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ wsock32.lib user32.lib \ diff --git a/README.win32 b/README.win32 index d0d3c160a5..135855934a 100644 --- a/README.win32 +++ b/README.win32 @@ -1,4 +1,4 @@ -$Id: README.win32,v 1.45 2003/04/07 22:39:25 guy Exp $ +$Id: README.win32,v 1.46 2003/06/02 18:40:00 gerald Exp $ Installing Ethereal, Tethereal, and Editcap on Win32 ==================================================== @@ -146,15 +146,20 @@ or the mirror site at Compiling the Ethereal distribution from source =============================================== + You'll need the development packages for GLIB, GTK+, WinPcap, zlib, -and Net-SNMP. The GLIB, GTK+, and WinPcap packages are available from -the respctive home pages for each project (the same URLs as listed +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 and Net-SNMP packages are available -at +to link against. Precompiled zlib, Net-SNMP, and ADNS packages are +available at http://www.ethereal.com/distribution/win32/ +The ADNS package is also available at its homepage: + + http://adns.jgaa.com/ + Instructions for MS Visual C++ ---------------------------- diff --git a/config.h.win32 b/config.h.win32 index 768dad63b1..d013fbe242 100644 --- a/config.h.win32 +++ b/config.h.win32 @@ -1,4 +1,4 @@ -/* $Id: config.h.win32,v 1.38 2002/10/23 18:27:33 guy Exp $ */ +/* $Id: config.h.win32,v 1.39 2003/06/02 18:40:00 gerald Exp $ */ /* config.h.win32 Generated manually. :-) */ /* config.h. Generated automatically by configure. */ /* config.h.in. Generated automatically from configure.in by autoheader. */ @@ -109,6 +109,10 @@ /* Define if you have the z library (-lz). */ #define HAVE_LIBZ 1 +/* Define to use GNU ADNS library */ +#define HAVE_GNU_ADNS 1 +#define ADNS_JGAA_WIN32 1 + #ifndef WIN32 #define WIN32 1 #endif diff --git a/config.nmake b/config.nmake index ba80b59b3d..5858143a81 100644 --- a/config.nmake +++ b/config.nmake @@ -1,4 +1,4 @@ -# $Id: config.nmake,v 1.38 2003/05/01 03:09:51 gerald Exp $ +# $Id: config.nmake,v 1.39 2003/06/02 18:40:00 gerald Exp $ VERSION=0.9.12 RC_VERSION=0.9.12 @@ -12,6 +12,7 @@ GTK_DIR=C:\ethereal-win32-libs\gtk+ ZLIB_DIR=C:\ethereal-win32-libs\zlib-1.1.3 PCAP_DIR=C:\ethereal-win32-libs\WPdpack NET_SNMP_DIR=C:\ethereal-win32-libs\net-snmp-5.0.6 +ADNS_DIR=C:\ethereal-win32-libs\adns-1.0-win32-01 COMMON_FILES_GNU=c:\program files\common files\gnu diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake index 7f2664ac33..47c6f8e395 100644 --- a/epan/Makefile.nmake +++ b/epan/Makefile.nmake @@ -1,7 +1,7 @@ ## Makefile for building ethereal.exe with Microsoft C and nmake ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake,v 1.23 2002/10/22 08:22:05 guy Exp $ +# $Id: Makefile.nmake,v 1.24 2003/06/02 18:40:01 gerald Exp $ include ..\config.nmake @@ -10,6 +10,7 @@ include ..\config.nmake CFLAGS=-DHAVE_CONFIG_H /I. /I.. /I../wiretap \ /I$(GLIB_DIR) /I$(GTK_DIR) /I$(GLIB_DIR)/gmodule \ /I$(GTK_DIR)\gdk /I$(GTK_DIR)\gdk\win32 \ + /I$(ADNS_DIR)\src /I$(ADNS_DIR)\adns_win32 \ /I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS) CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL diff --git a/epan/config.h.win32 b/epan/config.h.win32 index 9733e2d1cb..dfbefc7372 100644 --- a/epan/config.h.win32 +++ b/epan/config.h.win32 @@ -1,4 +1,4 @@ -/* $Id: config.h.win32,v 1.10 2002/06/23 10:32:32 guy Exp $ */ +/* $Id: config.h.win32,v 1.11 2003/06/02 18:40:01 gerald Exp $ */ /* config.h.win32 Generated manually. :-) */ /* config.h. Generated automatically by configure. */ /* config.h.in. Generated automatically from configure.in by autoheader. */ @@ -71,6 +71,10 @@ /* Define if you have the <unistd.h> header file. */ /* #undef HAVE_UNISTD_H */ +/* Define to use GNU ADNS library */ +#define HAVE_GNU_ADNS 1 +#define ADNS_JGAA_WIN32 1 + #define HAVE_PLUGINS 1 #define PLUGINS_NEED_ADDRESS_TABLE 1 diff --git a/packaging/nsis/ethereal.nsi b/packaging/nsis/ethereal.nsi index 0bc2f95d4a..995013f472 100644 --- a/packaging/nsis/ethereal.nsi +++ b/packaging/nsis/ethereal.nsi @@ -1,7 +1,7 @@ ; ; ethereal.nsi ; -; $Id: ethereal.nsi,v 1.12 2003/04/21 21:28:36 guy Exp $ +; $Id: ethereal.nsi,v 1.13 2003/06/02 18:40:02 gerald Exp $ ; ============================================================================ ; Header configuration @@ -76,6 +76,7 @@ File "${COMMON_FILES_GNU}\glib-1.3.dll" File "${COMMON_FILES_GNU}\gmodule-1.3.dll" File "${COMMON_FILES_GNU}\gnu-intl.dll" File "${COMMON_FILES_GNU}\zlib.dll" +File "${COMMON_FILES_GNU}\adns_dll.dll File "..\..\FAQ" File "..\..\README" File "..\..\README.win32" |