diff options
| author | Guy Harris <guy@alum.mit.edu> | 2003-06-15 22:58:19 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2003-06-15 22:58:19 +0000 |
| commit | c88189af06e891fe0ce55c0da6868ae64f4fa660 (patch) | |
| tree | d1d37d7e0da4aa217d95c964c35b8c9a11f9bd52 | |
| parent | 698c0c9d4d7e662c031db2083d0646dad8080ab4 (diff) | |
Based on a change from Lars Roland, set the GLIB_CFLAGS, GTK_CFLAGS,
GLIB_LIBS, and GTK_LIBS variables based on whether the GLib and GTK+
header files and libraries are in separate "glib" and "gtk+" directories
(as is the case for the developer's packages from the Ethereal Web site)
or in the same directory (as is the case for the developer's packages
from the GTK+-for-Win32 site).
svn path=/trunk/; revision=7890
| -rw-r--r-- | config.nmake | 35 |
1 files changed, 33 insertions, 2 deletions
diff --git a/config.nmake b/config.nmake index 15a2b12551..7ad2282e44 100644 --- a/config.nmake +++ b/config.nmake @@ -1,4 +1,4 @@ -# $Id: config.nmake,v 1.45 2003/06/14 20:45:23 guy Exp $ +# $Id: config.nmake,v 1.46 2003/06/15 22:58:19 guy Exp $ VERSION=0.9.13 # @@ -18,8 +18,25 @@ WTAP_VERSION=0.0 GTK_VERSION=1.3 GLIB_VERSION=1.3 +# +# If you have versions of the developer's packages for GLib and GTK+ +# that install GLib and GTK+ header files and libraries in the same +# directory (as is the case with, for example, the developer's packages +# from the GTK+-for-Win32 site), set GLIB_GTK_DIR to the pathname of the +# top-level directory for those packages, and arrange that GLIB_DIR and +# GTK_DIR are not set. +# +# If you have versions of the developer's packages for GLib and GTK+ +# that install GLib header files and libraries in a "glib" directory and +# GTK+ header files and libraries in a "gtk+" directory (as is the case +# with, for example, the developer's packages from the Ethereal site), set +# GLIB_DIR to the pathname of the "glib" directory and GTK_DIR to the +# pathname of the "gtk+" directory, and arrange that GLIB_GTK_DIR is +# not set. +# GLIB_DIR=C:\ethereal-win32-libs\glib GTK_DIR=C:\ethereal-win32-libs\gtk+ + ZLIB_DIR=C:\ethereal-win32-libs\zlib-1.1.3 PCAP_DIR=C:\ethereal-win32-libs\WPdpack NET_SNMP_DIR=C:\ethereal-win32-libs\net-snmp-5.0.6 @@ -67,10 +84,24 @@ MAKENSIS="C:/program files/nsis/makensis.exe" # send us the patches, along with details of why the change # was necessary. # +!IFDEF $(GLIB_GTK_DIR) +GLIB_CFLAGS=/I$(GTK_GLIB_DIR)\include\glib-$(GLIB_VERSION) +GTK_CFLAGS=$(GLIB_CFLAGS) /I$(GTK_GLIB_DIR)\include\gtk-$(GTK_VERSION) \ + /I$(GTK_GLIB_DIR)\include\atk-1.0 \ + /I$(GTK_GLIB_DIR)\include\pango-1.0 +GLIB_LIBS=$(GLIB_GTK_DIR)\lib\glib-$(GLIB_VERSION).lib \ + $(GLIB_GTK_DIR)\lib\gmodule-$(GLIB_VERSION).lib \ + $(GLIB_GTK_DIR)\lib\gobject-$(GLIB_VERSION).lib +GTK_LIBS=$(GLIB_GTK_DIR)\lib\gtk-win32-$(GTK_VERSION).lib \ + $(GLIB_GTK_DIR)\lib\gdk-win32-$(GTK_VERSION).lib \ + $(GLIB_GTK_DIR)\lib\pango-1.0.lib \ + $(GLIB_LIBS) +!ELSE 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) +GTK_CFLAGS=$(GLIB_CFLAGS) /I$(GTK_DIR) GLIB_LIBS=$(GLIB_DIR)\glib-$(GLIB_VERSION).lib \ $(GLIB_DIR)\gmodule\gmodule-$(GLIB_VERSION).lib GTK_LIBS=$(GTK_DIR)\gtk\gtk-$(GTK_VERSION).lib \ $(GTK_DIR)\gdk\gdk-$(GTK_VERSION).lib \ $(GLIB_LIBS) +!ENDIF |