diff options
| author | Gilbert Ramirez <gram@alumni.rice.edu> | 2001-04-06 03:52:45 +0000 |
|---|---|---|
| committer | Gilbert Ramirez <gram@alumni.rice.edu> | 2001-04-06 03:52:45 +0000 |
| commit | b71792efa488e5236350ea78f12b671b9e797356 (patch) | |
| tree | 58e39c7c0e12572c8ca491ac68f606b7bad930cf /wiretap | |
| parent | 00be3b8f13cad268876b733f6fb5d1b13e6edb97 (diff) | |
| download | wireshark-b71792efa488e5236350ea78f12b671b9e797356.tar.gz wireshark-b71792efa488e5236350ea78f12b671b9e797356.tar.bz2 wireshark-b71792efa488e5236350ea78f12b671b9e797356.zip | |
Build with zlib.
Pre-compiled zlib provided at
http://www.ethereal.com/distribution/win32/zlib-1.1.3-fixed.zip
"fixed" because the pre-compiled version in the "extralibs" package
from the Gimp/Win32 page has a fault zlib.lib in it.
Add note about zlib in README.win32; more work needs to be done to
this file to mention new packaging method.
svn path=/trunk/; revision=3263
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/Makefile.nmake | 12 | ||||
| -rw-r--r-- | wiretap/config.h.win32 | 4 |
2 files changed, 7 insertions, 9 deletions
diff --git a/wiretap/Makefile.nmake b/wiretap/Makefile.nmake index d773464aca..8974bd9842 100644 --- a/wiretap/Makefile.nmake +++ b/wiretap/Makefile.nmake @@ -1,5 +1,5 @@ # -# $Id: Makefile.nmake,v 1.18 2001/04/05 04:39:29 gram Exp $ +# $Id: Makefile.nmake,v 1.19 2001/04/06 03:52:45 gram Exp $ # include ..\config.nmake @@ -7,13 +7,10 @@ include <win32.mak> ############### no need to modify below this line ######### -CFLAGS=-DHAVE_CONFIG_H /I$(GLIB_DIR) $(LOCAL_CFLAGS) - -CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL - +CFLAGS=-DHAVE_CONFIG_H /I$(GLIB_DIR) /I$(ZLIB_DIR) $(LOCAL_CFLAGS) {$S}.c{$O}.obj:: - $(CC) $(CVARSDLL) $(CFLAGS) -Fd$O\ -c $< + $(CC) $(cvarsdll) $(CFLAGS) -Fd$O\ -c $< OBJECTS=ascend-grammar.obj \ ascend-scanner.obj \ @@ -39,7 +36,8 @@ OBJECTS=ascend-grammar.obj \ wiretap_LIBS = \ - $(GLIB_DIR)\glib-$(GLIB_VERSION).lib + $(GLIB_DIR)\glib-$(GLIB_VERSION).lib \ + $(ZLIB_DIR)\zlib.lib all: wiretap-$(WTAP_VERSION).dll diff --git a/wiretap/config.h.win32 b/wiretap/config.h.win32 index a5fc0684b3..1d4b448754 100644 --- a/wiretap/config.h.win32 +++ b/wiretap/config.h.win32 @@ -1,4 +1,4 @@ -/* $Id: config.h.win32,v 1.7 2001/04/05 04:39:29 gram Exp $ */ +/* $Id: config.h.win32,v 1.8 2001/04/06 03:52:45 gram Exp $ */ /* config.h.win32 Generated manually. :-) */ /* config.h. Generated automatically by configure. */ /* config.h.in. Generated automatically from configure.in by autoheader. */ @@ -27,7 +27,7 @@ /* #define HAVE_UNISTD_H */ /* Define if you have the z library (-lz). */ -/*#define HAVE_LIBZ 1*/ +#define HAVE_LIBZ /* Define if you have the <sys/stat.h> header file. */ #define HAVE_SYS_STAT_H 1 |