diff options
| author | Tor Lillqvist <tml@iki.fi> | 2000-08-20 08:36:41 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2000-08-20 08:36:41 +0000 |
| commit | 79546feb86a232b0d3e01b1f436e258aef32b840 (patch) | |
| tree | d35f417b2a3112bb3e0fb18d4fc057a37ab79f40 /examples/Makefile.am | |
| parent | e95590dd006740ab6bdcf71cae31efbf8404033e (diff) | |
| download | pango-79546feb86a232b0d3e01b1f436e258aef32b840.tar.gz | |
Add parameter telling whether to print warning or not if string isn't
2000-08-20 Tor Lillqvist <tml@iki.fi>
* pango/pango-utils.c (pango_parse_*): Add parameter telling
whether to print warning or not if string isn't recognised. Use
g_strncasecmp().
* pango/pango-utils.h: Change prototype accordingly.
* pango/pangox-fontmap.c
* pango/pangowin32-fontmap.c: Change calls correspondingly.
* pango/pangowin32.h:
* pango/pangowin32.c: Cosmetic changes, dead code removal.
* pango/pangoft2.h
* pango/pangoft2-private.h
* pango/pangoft2.c
* pango/pangoft2-fontmap.c
* pango/pangoft2-fontcache.c: New files implementing a FreeType2
backend. Used only on Win32 so far, but doesn't contain
Win32-specific code per se, so if somebody wants to try it out on
X11, too, be my guest.
It works, more or less, but there are some details still to sort
out. Performance needs to be improved. Debugging printouts still
present. Font path currently hardcoded to C:\windows\fonts, heh.
Owen says he doesn't think it's a good idea to use ths on Win32,
but I'll try anyway. If it turns out using the native Win32 GDI
backend is better after all, oh well.
* pango/makefile.mingw: Delete. Move contents to
makefile.mingw.in.
* pango/makefile.mingw.in: New file. Add rules for
FreeType2 backend. Add FreeType2 CFLAGS and LIBS.
* pango/Makefile.am: Generate makefile.mingw.
(EXTRA_DIST): Add FreeType2 backend sources, and
makefile.mingw{,.in}
* modules/basic/basic-win32.c: Couple of cosmetic changes.
* modules/basic/Makefile.am: Generate makefile.mingw.
(EXTRA_DIST): Add basic-ft2.c, and makefile.mingw{,.in}
* modules/basic/makefile.mingw: Delete. Move contents to
makefile.mingw.in.
* modules/basic/makefile.mingw.in: New file. Add rule for
basic-ft2. Add FreeType2 CFLAGS and LIBS.
* examples/viewer-win32.c (read_file): Fix error messages.
(draw): Get HDC from GDK once for all paragraphs.
* examples/viewer-ft2.c: New file. The FT_Bitmap (256-level
bitmap) produced by the FreeType2 backend is copied to the
GtkLayout window using gdk_draw_gray_image from GdkRGB (!). Yes,
this is kinda circular dependency between Pango and GTK+.
* examples/makefile.mingw: Delete. Move contents to
makefile.mingw.in.
* examples/makefile.mingw.in: New file. Add rules for
viewer-ft2. Add FreeType2 CFLAGS and LIBS.
* examples/Makefile.am: Generate makefile.mingw.
(EXTRA_DIST): Add viewer-win32.c and viewer-ft2.c, and
makefile.mingw{,.in}
Diffstat (limited to 'examples/Makefile.am')
| -rw-r--r-- | examples/Makefile.am | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/examples/Makefile.am b/examples/Makefile.am index 225498d1..2fbdfc1e 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -34,7 +34,18 @@ pango.modules: ( cd ../modules && \ ../pango/pango-querymodules `find . -name '*.so'` > ../examples/pango.modules ) -EXTRA_DIST=HELLO.utf8 muru.utf pangox.aliases +EXTRA_DIST= \ + viewer-win32.c \ + viewer-ft2.c \ + makefile.mingw \ + makefile.mingw.in \ + HELLO.utf8 \ + muru.utf \ + pangox.aliases alias_DATA = pangox.aliases +makefile.mingw: $(top_builddir)/config.status $(top_srcdir)/examples/makefile.mingw.in + cd $(top_builddir) && CONFIG_FILES=examples/$@ CONFIG_HEADERS= $(SHELL) ./config.status + + |