diff options
| author | Hans Breuer <hans@breuer.org> | 2001-11-23 13:12:51 +0000 |
|---|---|---|
| committer | Hans Breuer <hans@src.gnome.org> | 2001-11-23 13:12:51 +0000 |
| commit | b4b11e4ba669ddfdb54e7da737f9b9b0f22b9e9f (patch) | |
| tree | 1b57c4eee70532bfa12651d12a131e7488c68026 /pango/makefile.msc | |
| parent | a2c1ae618174619a2b99a7f8e765713be249c5e2 (diff) | |
| download | pango-b4b11e4ba669ddfdb54e7da737f9b9b0f22b9e9f.tar.gz | |
removed the arbitrary limit to 10 fonts. Instead make the command line
2001-11-23 Hans Breuer <hans@breuer.org>
* testfonts.c : removed the arbitrary limit to 10 fonts.
Instead make the command line params useful again and reduce
the default result bitmap size by decreasing the default
font size.
* pango/pangowin32-fontcache.c (pango_win32_font_cache_load):
Don't always turn on anti-aliasing. Respect the users settings
from 'Properties of Display/Effects'.
* pango/makefile.msc : updated, version 0.22
* pango/pango.def : updated externals
* pango/font.c pango/pango-coverage.c pango-utils.c
pango/pangowin32.c pango/shape.c :
coding style and static correctness
Diffstat (limited to 'pango/makefile.msc')
| -rw-r--r-- | pango/makefile.msc | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/pango/makefile.msc b/pango/makefile.msc index 51aa9165..16f62ee9 100644 --- a/pango/makefile.msc +++ b/pango/makefile.msc @@ -1,12 +1,12 @@ TOP = ../.. -!INCLUDE $(TOP)/build/win32/make.msc +!INCLUDE $(TOP)/glib/build/win32/make.msc !IFNDEF PERL PERL = perl !ENDIF # Possibly override Pango version from build/win32/module.defs -PANGO_VER = 0.21 +PANGO_VER = 0.22 # INCLUDES = -I .. -I . # DEFINES = -DPACKAGE=\"Pango\" -DVERSION=\"$(PANGO_VER)\" @@ -46,7 +46,7 @@ PKG_CFLAGS = -I.. -I. -I$(PRJ_TOP) \ -DPACKAGE=\"Pango\" -DVERSION=\"$(PANGO_VER)\" \ -DPANGO_ENABLE_BACKEND -DPANGO_ENABLE_ENGINE \ $(GLIB_CFLAGS) $(LIBICONV_CFLAGS) \ - $(FREETYPE2_CFLAGS) $(DIRENT_CFLAGS) \ + $(FREETYPE2_CFLAGS) \ $(X11_CFLAGS) -DSYSCONFDIR=\"/etc\" !IFDEF OBJS_pango @@ -60,8 +60,8 @@ PKG_LINK = $(GLIB_LIBS) $(LIBICONV_LIBS) \ !ENDIF !IFDEF OBJS_pangoft2 -PKG_LINK = $(GLIB_LIBS) $(LIBICONV_LIBS) $(FREETYPE2_LIBS) $(DIRENT_LIBS) \ - pango-$(PANGO_VER).lib +PKG_LINK = $(GLIB_LIBS) $(LIBICONV_LIBS) $(FREETYPE2_LIBS) \ + pango-$(PANGO_VER).lib mini-xft/mini-xft.lib !ENDIF !IFDEF OBJS_pangox @@ -70,13 +70,12 @@ PKG_LINK = $(GLIB_LIBS) $(LIBICONV_LIBS) \ !ENDIF !IF DEFINED (OBJS_querymodules) || DEFINED (OBJS_testfonts) -PKG_LINK = $(GLIB_LIBS) $(LIBICONV_LIBS) $(DIRENT_LIBS) \ +PKG_LINK = $(GLIB_LIBS) $(LIBICONV_LIBS) \ pango-$(PANGO_VER).lib pangowin32-$(PANGO_VER).lib !ENDIF !IFDEF OBJS_pango OBJECTS = \ -# backend.obj \ break.obj \ fonts.obj \ glyphstring.obj \ @@ -86,6 +85,7 @@ OBJECTS = \ pango-color.obj \ pango-context.obj \ pango-coverage.obj \ + pango-fontset.obj \ pango-fontmap.obj \ pango-intset.obj \ pango-item.obj \ @@ -128,7 +128,6 @@ OBJECTS = \ OBJECTS = \ module-defs-ft2.obj \ pangoft2.obj \ - pangoft2-fontcache.obj \ pangoft2-fontmap.obj \ basic-ft2.obj !ENDIF |