diff options
author | Tor Lillqvist <tml@novell.com> | 2005-09-22 15:00:39 +0000 |
---|---|---|
committer | Tor Lillqvist <tml@src.gnome.org> | 2005-09-22 15:00:39 +0000 |
commit | 9b9374594df6c1e58eea8be0c3b96f680316430e (patch) | |
tree | a987766a04bdd0268f7c21865d71bc90cbd8d14a /pango/Makefile.am | |
parent | 070475029649c86d378cb12eb6def74c01b8acf4 (diff) | |
download | pango-9b9374594df6c1e58eea8be0c3b96f680316430e.tar.gz |
Move the calculation of dpi and size earlier. Use the size variable instad
2005-09-22 Tor Lillqvist <tml@novell.com>
* pango/pangocairo-win32font.c (_pango_cairo_win32_font_new): Move
the calculation of dpi and size earlier. Use the size variable
instad of isize when looking for a matching cached font. Isize was
supposed to be the same as size anyway. (Actually it was the same
only when LOGPIXELSY equalled 96 (which often is the default
value), see below.)
* pango/pangocairo-win32fontmap.c (pango_cairo_win32_font_map_init):
Set dpi to the LOGPIXELSY value instead of hardcoding 96.
* pango/Makefile.am (libpangocairo_1_0_la_LIBADD): Need WIN32_LIBS
now.
Diffstat (limited to 'pango/Makefile.am')
-rw-r--r-- | pango/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pango/Makefile.am b/pango/Makefile.am index 07811a0e..4f00c730 100644 --- a/pango/Makefile.am +++ b/pango/Makefile.am @@ -230,7 +230,7 @@ if HAVE_CAIRO_WIN32 libpangocairo_1_0_la_LDFLAGS += -export-symbols $(srcdir)/pangocairo.def libpangocairo_1_0_la_DEPENDENCIES += pangocairo.def -libpangocairo_1_0_la_LIBADD += libpangowin32-$(PANGO_API_VERSION).la +libpangocairo_1_0_la_LIBADD += libpangowin32-$(PANGO_API_VERSION).la $(WIN32_LIBS) libpangocairo_1_0_la_DEPENDENCIES += libpangowin32-$(PANGO_API_VERSION).la libpangocairo_1_0_la_SOURCES += pangocairo-win32font.c pangocairo-win32fontmap.c pangocairo-win32.h |