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 /gtk/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 'gtk/Makefile.nmake')
| -rw-r--r-- | gtk/Makefile.nmake | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/gtk/Makefile.nmake b/gtk/Makefile.nmake index 4f2862a963..73b6e42b5c 100644 --- a/gtk/Makefile.nmake +++ b/gtk/Makefile.nmake @@ -1,15 +1,13 @@ ## Makefile for building ethereal.exe with Microsoft C and nmake ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake,v 1.43 2003/04/25 20:54:18 guy Exp $ +# $Id: Makefile.nmake,v 1.44 2003/06/14 20:35:57 guy Exp $ include ..\config.nmake ############### no need to modify below this line ######### -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 \ +CFLAGS=-DHAVE_CONFIG_H /I.. /I../wiretap $(GTK_CFLAGS) \ /I$(ZLIB_DIR) \ /I$(PCAP_DIR)\WPCAP\LIBPCAP /I$(PCAP_DIR)\WPCAP\LIBPCAP\bpf \ /I$(PCAP_DIR)\WPCAP\LIBPCAP\lbl \ |