summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@novell.com>2005-09-22 14:58:53 +0000
committerTor Lillqvist <tml@src.gnome.org>2005-09-22 14:58:53 +0000
commit45433d90785c5f0925cafc027659d27124ff0d06 (patch)
tree62f94892664ab74a499b9838b74ca5db3eb9a9dd
parent6958d8df04a66a2a8e31bdbfd6d20cbe7bcb2a4c (diff)
downloadpango-45433d90785c5f0925cafc027659d27124ff0d06.tar.gz
Need WIN32_LIBS now.
2005-09-22 Tor Lillqvist <tml@novell.com> * pango/Makefile.am (libpangocairo_1_0_la_LIBADD): Need WIN32_LIBS now.
-rw-r--r--ChangeLog3
-rw-r--r--pango/Makefile.am2
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 92c4d4f9..61b57aed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,9 @@
* 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.
+
2005-09-14 Tor Lillqvist <tml@novell.com>
* pango/pangocairo-win32font.c: Use identical glyph extents
diff --git a/pango/Makefile.am b/pango/Makefile.am
index 07811a0e..9d7ce969 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