diff options
| -rw-r--r-- | config.nmake | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/config.nmake b/config.nmake index 2264607dae..96c5e938da 100644 --- a/config.nmake +++ b/config.nmake @@ -1,4 +1,4 @@ -# $Id: config.nmake,v 1.49 2003/06/17 04:21:59 guy Exp $ +# $Id: config.nmake,v 1.50 2003/06/17 05:38:24 guy Exp $ VERSION=0.9.13 # @@ -19,20 +19,17 @@ 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. +# This presumes that GLib 1.3 developer's packages put header files and +# libraries directly in a "glib" directory and GTK+ 1.3 packages put +# header files and libraries directly in a "gtk+" directory, while GLib +# 2.x developer's packages put header files in an "include\glib-{version}" +# directory and libraries in a "lib\glib-{version}" directory, and GTK+ +# 2.x developer's packages put header files in an "include\gtk-{version}" +# directory and libraries in a "lib\gtk-{version}" directory. # -# 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. +# If the version of a developer's package is 1.3, set the appropriate +# _DIR variable to the "glib" or "gtk+" directory; if it's 2.x, set it +# to the directory in which the "include" and "lib" directories reside. # GLIB_DIR=C:\ethereal-win32-libs\glib GTK_DIR=C:\ethereal-win32-libs\gtk+ @@ -84,28 +81,31 @@ 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$(GLIB_GTK_DIR)\include\glib-$(GLIB_VERSION) \ - /I$(GLIB_GTK_DIR)\lib\glib-$(GLIB_VERSION)\include -GTK_CFLAGS=$(GLIB_CFLAGS) /I$(GLIB_GTK_DIR)\include\gtk-$(GTK_VERSION) \ - /I$(GLIB_GTK_DIR)\lib\gtk-$(GTK_VERSION)\include \ - /I$(GLIB_GTK_DIR)\include\atk-1.0 \ - /I$(GLIB_GTK_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 +!IF "$(GLIB_VERSION)" == "1.3" GLIB_CFLAGS=/I$(GLIB_DIR) /I$(GLIB_DIR)\gmodule -GTK_CFLAGS=$(GLIB_CFLAGS) /I$(GTK_DIR) /I$(GTK_DIR)\gdk GLIB_LIBS=$(GLIB_DIR)\glib-$(GLIB_VERSION).lib \ $(GLIB_DIR)\gmodule\gmodule-$(GLIB_VERSION).lib +!ELSE +GLIB_CFLAGS=/I$(GLIB_DIR)\include\glib-$(GLIB_VERSION) \ + /I$(GLIB_DIR)\lib\glib-$(GLIB_VERSION)\include +GLIB_LIBS=$(GLIB_DIR)\lib\glib-$(GLIB_VERSION).lib \ + $(GLIB_DIR)\lib\gmodule-$(GLIB_VERSION).lib \ + $(GLIB_DIR)\lib\gobject-$(GLIB_VERSION).lib +!ENDIF +!IF "$(GTK_VERSION)" == "1.3" +GTK_CFLAGS=$(GLIB_CFLAGS) /I$(GTK_DIR) /I$(GTK_DIR)\gdk GTK_LIBS=$(GTK_DIR)\gtk\gtk-$(GTK_VERSION).lib \ $(GTK_DIR)\gdk\gdk-$(GTK_VERSION).lib \ $(GLIB_LIBS) +!ELSE +GTK_CFLAGS=$(GLIB_CFLAGS) /I$(GTK_DIR)\include\gtk-$(GTK_VERSION) \ + /I$(GTK_DIR)\lib\gtk-$(GTK_VERSION)\include \ + /I$(GTK_DIR)\include\atk-1.0 \ + /I$(GTK_DIR)\include\pango-1.0 +GTK_LIBS=$(GTK_DIR)\lib\gtk-win32-$(GTK_VERSION).lib \ + $(GTK_DIR)\lib\gdk-win32-$(GTK_VERSION).lib \ + $(GTK_DIR)\lib\pango-1.0.lib \ + $(GLIB_LIBS) !ENDIF !IFDEF ADNS_DIR |