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 /config.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 'config.nmake')
| -rw-r--r-- | config.nmake | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/config.nmake b/config.nmake index 724342f7cd..d60abb3507 100644 --- a/config.nmake +++ b/config.nmake @@ -1,4 +1,4 @@ -# $Id: config.nmake,v 1.43 2003/06/14 03:23:21 guy Exp $ +# $Id: config.nmake,v 1.44 2003/06/14 20:35:55 guy Exp $ VERSION=0.9.13 # @@ -57,3 +57,15 @@ YACC=bison # To build the installer MAKENSIS="C:/program files/nsis/makensis.exe" + +# +# You should not have to change anything below this comment. +# If you do, it's a deficiency in the Makefile.nmake files; +# either tell ethereal-dev@ethereal.com about it, including +# details of why you had to change it, or fix config.nmake +# and any Makefile.nmake files that need to be changed, and +# send us the patches, along with details of why the change +# was necessary. +# +GLIB_CFLAGS=/I$(GLIB_DIR) /I$(GLIB_DIR)\gmodule +GTK_CFLAGS=/I$(GTK_DIR) /I$(GTK_DIR)\gdk /I$(GTK_DIR)\gdk\win32 $(GLIB_CFLAGS) |