diff options
| author | Hans Breuer <hans@breuer.org> | 2001-11-03 11:37:51 +0000 |
|---|---|---|
| committer | Hans Breuer <hans@src.gnome.org> | 2001-11-03 11:37:51 +0000 |
| commit | 29a68a3b824a279f39b274af96244fb9c6665839 (patch) | |
| tree | 5ac14cba7d953d9cced6211ca07502998337b155 /pango/makefile.msc | |
| parent | b851a3c13af7e7cd4750fa7df1f80782415a0c54 (diff) | |
| download | pango-29a68a3b824a279f39b274af96244fb9c6665839.tar.gz | |
don't bother with module dir recalculation if LIBDIR isn't defined
2001-11-03 Hans Breuer <hans@breuer.org>
* pango/modules.c : don't bother with module dir
recalculation if LIBDIR isn't defined
* pango/pangowin32-fontmap.c : make it compile again
after the g_ascii_* change below. Use EnumFontFamiliesExA
to ensure to use the ascii version, though defining
UNICODE for G_OS_WIN32 will break at other place anyway.
* pango/makefile.msc : use (hopefully temporary) DIRENT_CFLAGS
and DIRENT_LIBS (see #63667)
Diffstat (limited to 'pango/makefile.msc')
| -rw-r--r-- | pango/makefile.msc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/pango/makefile.msc b/pango/makefile.msc index 0a80691e..51aa9165 100644 --- a/pango/makefile.msc +++ b/pango/makefile.msc @@ -6,10 +6,10 @@ PERL = perl !ENDIF # Possibly override Pango version from build/win32/module.defs -PANGO_VER = 0.19 +PANGO_VER = 0.21 # INCLUDES = -I .. -I . -# DEFINES = +# DEFINES = -DPACKAGE=\"Pango\" -DVERSION=\"$(PANGO_VER)\" # DEPCFLAGS = $(GLIB_CFLAGS) $(LIBICONV_CFLAGS) $(FREETYPE2_CFLAGS) !IFNDEF PACKAGE @@ -43,9 +43,10 @@ PKG_VER = $(PANGO_VER) PKG_DEF = $(PACKAGE).def PKG_CFLAGS = -I.. -I. -I$(PRJ_TOP) \ + -DPACKAGE=\"Pango\" -DVERSION=\"$(PANGO_VER)\" \ -DPANGO_ENABLE_BACKEND -DPANGO_ENABLE_ENGINE \ $(GLIB_CFLAGS) $(LIBICONV_CFLAGS) \ - $(FREETYPE2_CFLAGS) \ + $(FREETYPE2_CFLAGS) $(DIRENT_CFLAGS) \ $(X11_CFLAGS) -DSYSCONFDIR=\"/etc\" !IFDEF OBJS_pango @@ -59,7 +60,7 @@ PKG_LINK = $(GLIB_LIBS) $(LIBICONV_LIBS) \ !ENDIF !IFDEF OBJS_pangoft2 -PKG_LINK = $(GLIB_LIBS) $(LIBICONV_LIBS) $(FREETYPE2_LIBS) \ +PKG_LINK = $(GLIB_LIBS) $(LIBICONV_LIBS) $(FREETYPE2_LIBS) $(DIRENT_LIBS) \ pango-$(PANGO_VER).lib !ENDIF @@ -69,7 +70,7 @@ PKG_LINK = $(GLIB_LIBS) $(LIBICONV_LIBS) \ !ENDIF !IF DEFINED (OBJS_querymodules) || DEFINED (OBJS_testfonts) -PKG_LINK = $(GLIB_LIBS) $(LIBICONV_LIBS) \ +PKG_LINK = $(GLIB_LIBS) $(LIBICONV_LIBS) $(DIRENT_LIBS) \ pango-$(PANGO_VER).lib pangowin32-$(PANGO_VER).lib !ENDIF |