diff options
| author | Guy Harris <guy@alum.mit.edu> | 2003-06-14 20:36:04 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2003-06-14 20:36:04 +0000 |
| commit | 71424053cd5e62f8f94bdb81af98e7ee2830fc46 (patch) | |
| tree | 080e2f9d9377e63f0e3556c8173fc194803b2751 /wiretap/Makefile.nmake | |
| parent | 25bd670668c348c80fc8e4cb61cf66f58909cd8d (diff) | |
Define GLIB_CFLAGS and GTK_CFLAGS variables in config.nmake (based on
variables the user configures - the user isn't expected to change
GLIB_CFLAGS or GTK_CFLAGS, and there's a comment nothing that users
shouldn't have to do so), which contain the appropriate "/I" flags for
building stuff that requires only GLib, and stuff that required GTK+ and
GLib, respectively, and use those macros in the Makefile.nmake files.
svn path=/trunk/; revision=7884
Diffstat (limited to 'wiretap/Makefile.nmake')
| -rw-r--r-- | wiretap/Makefile.nmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wiretap/Makefile.nmake b/wiretap/Makefile.nmake index 55c80d635d..babe8a58c7 100644 --- a/wiretap/Makefile.nmake +++ b/wiretap/Makefile.nmake @@ -1,5 +1,5 @@ # -# $Id: Makefile.nmake,v 1.28 2002/07/31 19:27:56 guy Exp $ +# $Id: Makefile.nmake,v 1.29 2003/06/14 20:36:04 guy Exp $ # include ..\config.nmake @@ -7,7 +7,7 @@ include <win32.mak> ############### no need to modify below this line ######### -CFLAGS=-DHAVE_CONFIG_H /I$(GLIB_DIR) /I$(ZLIB_DIR) /I$(PCAP_DIR)/include \ +CFLAGS=-DHAVE_CONFIG_H $(GLIB_CFLAGS) /I$(ZLIB_DIR) /I$(PCAP_DIR)/include \ -D_U_="" $(LOCAL_CFLAGS) .c.obj:: |