summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--pango/Makefile.am3
-rw-r--r--pango/pangocairo.def4
3 files changed, 16 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index cfdee6f7..87d8dd98 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-08-25 Tor Lillqvist <tml@novell.com>
+
+ * pango/Makefile.am: Use pangocairo.def when linking libpangocairo
+ on Windows, instead of relying on GNU ld auto-exporting all public
+ symbols.
+
+ * pango/pangocairo.def: Add missing entries. (#314420, Kazuki
+ Iwamoto)
+
2005-08-24 Owen Taylor <otaylor@redhat.com>
* pango/pangocairo-render.c (draw_error_underline): convert
diff --git a/pango/Makefile.am b/pango/Makefile.am
index e8c48941..07811a0e 100644
--- a/pango/Makefile.am
+++ b/pango/Makefile.am
@@ -227,6 +227,9 @@ libpangocairo_1_0_la_SOURCES = \
pangocairo-private.h
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_DEPENDENCIES += libpangowin32-$(PANGO_API_VERSION).la
diff --git a/pango/pangocairo.def b/pango/pangocairo.def
index c22fb620..6bf68f83 100644
--- a/pango/pangocairo.def
+++ b/pango/pangocairo.def
@@ -1,4 +1,8 @@
EXPORTS
+ pango_cairo_context_get_font_options
+ pango_cairo_context_get_resolution
+ pango_cairo_context_set_font_options
+ pango_cairo_context_set_resolution
pango_cairo_create_layout
pango_cairo_font_get_type
pango_cairo_font_map_create_context