diff options
| author | Guy Harris <guy@alum.mit.edu> | 2003-06-14 20:45:29 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2003-06-14 20:45:29 +0000 |
| commit | 8178db498052bef672bae1abfdf6ab001c4eae45 (patch) | |
| tree | cd4e2a516fff203443003c671b6f33d32568151e /epan/Makefile.nmake | |
| parent | 71424053cd5e62f8f94bdb81af98e7ee2830fc46 (diff) | |
Define GLIB_LIBS and GTK_LIBS variables in config.nmake (based on
variables the user configures - the user isn't expected to change
GLIB_LIBS or GTK_LIBS, and there's a comment nothing that users
shouldn't have to do so), which contain the appropriate libraries 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=7885
Diffstat (limited to 'epan/Makefile.nmake')
| -rw-r--r-- | epan/Makefile.nmake | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake index 0a42f95cbd..d7e8f88ed1 100644 --- a/epan/Makefile.nmake +++ b/epan/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.27 2003/06/14 20:35:56 guy Exp $ +# $Id: Makefile.nmake,v 1.28 2003/06/14 20:45:24 guy Exp $ include ..\config.nmake @@ -18,8 +18,7 @@ CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL # For use when making ethereal.dll libethereal_LIBS = \ wsock32.lib user32.lib \ - $(GLIB_DIR)\glib-$(GLIB_VERSION).lib \ - $(GLIB_DIR)\gmodule\gmodule-$(GLIB_VERSION).lib + $(GLIB_LIBS) .c.obj:: $(CC) $(CVARSDLL) $(CFLAGS) -Fd.\ -c $< |