diff options
| author | Guy Harris <guy@alum.mit.edu> | 2002-09-10 10:08:41 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2002-09-10 10:08:41 +0000 |
| commit | 1d5b83b84277198a087777d7dc58d335cba6be72 (patch) | |
| tree | 1c7e12a679ba4393f453b559f364d9b2cebc8aed | |
| parent | 5d3283f7e85b1110076e2469bcddb52ff76baebc (diff) | |
Add "/I$(ZLIB_DIR)" to the list of "/I" flags in the top-level directory
and the "gtk" and "gtk2" directories, so that we find "zlib.h", as we
now define "HAVE_ZLIB" in the top-level "config.h.win32" and thus try to
include "zlib.h" on Windows.
svn path=/trunk/; revision=6246
| -rw-r--r-- | Makefile.nmake | 4 | ||||
| -rw-r--r-- | gtk/Makefile.nmake | 3 | ||||
| -rw-r--r-- | gtk2/Makefile.nmake | 3 |
3 files changed, 6 insertions, 4 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index c30a746a10..18de5bc27b 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.209 2002/09/10 08:28:14 guy Exp $ +# $Id: Makefile.nmake,v 1.210 2002/09/10 10:08:37 guy Exp $ include config.nmake include <win32.mak> @@ -15,7 +15,7 @@ LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS) 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$(PCAP_DIR)/include -D_U_="" + /I$(ZLIB_DIR) /I$(PCAP_DIR)/include -D_U_="" CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL diff --git a/gtk/Makefile.nmake b/gtk/Makefile.nmake index dd08aaa800..c9319974ad 100644 --- a/gtk/Makefile.nmake +++ b/gtk/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.29 2002/09/07 10:02:27 sahlberg Exp $ +# $Id: Makefile.nmake,v 1.30 2002/09/10 10:08:39 guy Exp $ include ..\config.nmake @@ -10,6 +10,7 @@ include ..\config.nmake CFLAGS=-DHAVE_CONFIG_H /I.. /I../wiretap \ /I$(GLIB_DIR) /I$(GTK_DIR) /I$(GLIB_DIR)/gmodule \ /I$(GTK_DIR)\gdk /I$(GTK_DIR)\gdk\win32 \ + /I$(ZLIB_DIR) \ /I$(PCAP_DIR)\WPCAP\LIBPCAP /I$(PCAP_DIR)\WPCAP\LIBPCAP\bpf \ /I$(PCAP_DIR)\WPCAP\LIBPCAP\lbl \ /I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS) diff --git a/gtk2/Makefile.nmake b/gtk2/Makefile.nmake index ae5f8647ff..6cf0f036da 100644 --- a/gtk2/Makefile.nmake +++ b/gtk2/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.5 2002/09/07 10:02:36 sahlberg Exp $ +# $Id: Makefile.nmake,v 1.6 2002/09/10 10:08:41 guy Exp $ include ..\config.nmake @@ -10,6 +10,7 @@ include ..\config.nmake CFLAGS=-DHAVE_CONFIG_H /I.. /I../wiretap \ /I$(GLIB_DIR) /I$(GTK_DIR) /I$(GLIB_DIR)/gmodule \ /I$(GTK_DIR)\gdk /I$(GTK_DIR)\gdk\win32 \ + /I$(ZLIB_DIR) \ /I$(PCAP_DIR)\WPCAP\LIBPCAP /I$(PCAP_DIR)\WPCAP\LIBPCAP\bpf \ /I$(PCAP_DIR)\WPCAP\LIBPCAP\lbl \ /I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS) |