diff options
| author | Guy Harris <guy@alum.mit.edu> | 2003-06-17 04:21:59 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2003-06-17 04:21:59 +0000 |
| commit | b65f1a77c1a7c5ffe15e76aa561028aa361e07cd (patch) | |
| tree | e632731390b0108e7b01dc064aa2026ffb3c4a42 | |
| parent | d6dadab52fb095bf04c34e6a87ad215f3a657199 (diff) | |
From Lars Roland:
fix typo in my earlier checkin - GTK_GLIB_DIR should be
GLIB_GTK_DIR;
look for headers in "lib\glib-$(GLIB_VERSION)\include and
"lib\gtk-$(GTK_VERSION)\include, as that's where the 2.x
packages hide "glibconfig.h" and "gdkconfig.h".
svn path=/trunk/; revision=7894
| -rw-r--r-- | config.nmake | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/config.nmake b/config.nmake index d3613c40eb..2264607dae 100644 --- a/config.nmake +++ b/config.nmake @@ -1,4 +1,4 @@ -# $Id: config.nmake,v 1.48 2003/06/16 07:58:26 guy Exp $ +# $Id: config.nmake,v 1.49 2003/06/17 04:21:59 guy Exp $ VERSION=0.9.13 # @@ -85,10 +85,12 @@ MAKENSIS="C:/program files/nsis/makensis.exe" # 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_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 |