updated to build with the new Cairo dependency added pangocairo.def to

2005-02-06  Hans Breuer  <hans@breuer.org>

	* pango/makefile.msc pango/*.def pango/pangocairo.def : updated to
	build with the new Cairo dependency
	* pango/Makefile.am : added pangocairo.def to EXTRA_DIST

8 files changed, 54 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 64add5d2..f104e7d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-02-06  Hans Breuer  <hans@breuer.org>
+
+	* pango/makefile.msc pango/*.def pango/pangocairo.def : updated to
+	build with the new Cairo dependency
+	* pango/Makefile.am : added pangocairo.def to EXTRA_DIST
+
 Thu Feb  3 19:00:17 2005  Manish Singh  <yosh@gimp.org>
 
 	* pango/pangocairo-fc.h: spell _pango_cairo_fc_get_render_key
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 64add5d2..f104e7d3 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,9 @@
+2005-02-06  Hans Breuer  <hans@breuer.org>
+
+	* pango/makefile.msc pango/*.def pango/pangocairo.def : updated to
+	build with the new Cairo dependency
+	* pango/Makefile.am : added pangocairo.def to EXTRA_DIST
+
 Thu Feb  3 19:00:17 2005  Manish Singh  <yosh@gimp.org>
 
 	* pango/pangocairo-fc.h: spell _pango_cairo_fc_get_render_key
diff --git a/pango/Makefile.am b/pango/Makefile.am
index f9e9697f..185900b9 100644
--- a/pango/Makefile.am
+++ b/pango/Makefile.am
@@ -348,6 +348,7 @@ EXTRA_DIST =					\
 	module-defs-win32.c.win32		\
 	module-defs.h				\
 	pango.def				\
+	pangocairo.def				\
 	pangowin32.def				\
 	pangoft2.def				\
 	makefile.msc				\
diff --git a/pango/makefile.msc b/pango/makefile.msc
index ffc1c3f0..1d1b1103 100644
--- a/pango/makefile.msc
+++ b/pango/makefile.msc
@@ -15,7 +15,7 @@ PANGO_MODULE_VERSION = 1.0.0
 
 !IFNDEF PACKAGE
 
-DLLS = pango pangowin32 pangoft2 # pangox
+DLLS = pango pangowin32 pangoft2 pangocairo # pangox
 EXES = querymodules testfonts
 #? test1 test2 test3 test4 test5
 
@@ -73,6 +73,12 @@ PKG_LINK = $(GLIB_LIBS) $(LIBICONV_LIBS) \
 	pango-$(PANGO_VER).lib $(X11_LIBS)
 !ENDIF
 
+!IFDEF OBJS_pangocairo
+PKG_LINK = $(GLIB_LIBS) $(LIBICONV_LIBS) \
+	pango-$(PANGO_VER).lib $(CAIRO_LIBS) \
+	pangoft2-$(PANGO_VER).lib $(FREETYPE2_LIBS) $(FONTCONFIG_LIBS) 
+!ENDIF
+
 !IF DEFINED (OBJS_querymodules) || DEFINED (OBJS_testfonts)
 PKG_LINK = $(GLIB_LIBS) $(LIBICONV_LIBS) \
 	pango-$(PANGO_VER).lib pangowin32-$(PANGO_VER).lib
@@ -123,7 +129,7 @@ basic-x.obj : ..\modules\basic\basic-x.c
 fribidi.obj : mini-fribidi\fribidi.c
 	$(CC) $(PKG_CFLAGS) -GD -c mini-fribidi\fribidi.c
 fribidi_get_type.obj : mini-fribidi\fribidi_get_type.c
-	$(CC) $(PKG_CFLAGS) -GD -c mini-fribidi\fribidi_get_type.c
+	$(CC) $(PKG_CFLAGS) -GD -Dpango_get_mirror_char=_pango_get_mirror_char -c mini-fribidi\fribidi_get_type.c
 
 !IFDEF OBJS_pangowin32
 PKG_CFLAGS = $(PKG_CFLAGS) -DPANGO_MODULE_PREFIX=_pango_basic_win32
@@ -160,6 +166,18 @@ OBJECTS = \
 	basic-x.obj
 !ENDIF
 
+!IFDEF OBJS_pangocairo
+PKG_CFLAGS = \
+	$(PKG_CFLAGS) $(FONTCONFIG_CFLAGS) $(FREETYPE2_CFLAGS) \
+	-DHAVE_CAIRO_FREETYPE $(CAIRO_CFLAGS)
+OBJECTS = \
+        pangocairo-fcfont.obj \
+        pangocairo-fcfontmap.obj \
+        pangocairo-font.obj \
+        pangocairo-fontmap.obj \
+        pangocairo-render.obj \
+!ENDIF
+
 !IFDEF OBJS_querymodules
 OBJECTS = \
 	querymodules.obj
@@ -190,6 +208,7 @@ pango_headers=		   \
 	pango-item.h	   \
 	pango-layout.h	   \
 	pango-modules.h	   \
+	pango-renderer.h   \
 	pango-script.h	   \
 	pango-tabs.h	   \
 	pango-types.h	   \
diff --git a/pango/pango.def b/pango/pango.def
index ccb3e6c8..b2a02ccf 100644
--- a/pango/pango.def
+++ b/pango/pango.def
@@ -32,10 +32,12 @@ EXPORTS
 	pango_attr_size_new
 	pango_attr_size_new_absolute
 	pango_attr_stretch_new
+	pango_attr_strikethrough_color_new
 	pango_attr_strikethrough_new
 	pango_attr_style_new
 	pango_attr_type_get_type
 	pango_attr_type_register
+	pango_attr_underline_color_new
 	pango_attr_underline_new
 	pango_attr_variant_new
 	pango_attr_weight_new
@@ -79,7 +81,6 @@ EXPORTS
 	pango_ellipsize_mode_get_type
 	pango_engine_get_type
 	pango_engine_lang_get_type
-	pango_engine_shape_class_init
 	pango_engine_shape_get_type
 	pango_find_base_dir
 	pango_find_map
diff --git a/pango/pangocairo.def b/pango/pangocairo.def
new file mode 100644
index 00000000..51b811e4
--- /dev/null
+++ b/pango/pangocairo.def
@@ -0,0 +1,14 @@
+EXPORTS
+	pango_cairo_create_layout
+	pango_cairo_font_get_type
+	pango_cairo_font_map_create_context
+	pango_cairo_font_map_get_default
+	pango_cairo_font_map_get_resolution
+	pango_cairo_font_map_get_type
+	pango_cairo_font_map_new
+	pango_cairo_font_map_set_resolution
+	pango_cairo_show_glyphs
+	pango_cairo_show_layout
+	pango_cairo_show_layout_line
+	pango_cairo_update_context
+	pango_cairo_update_layout
diff --git a/pango/pangoft2.def b/pango/pangoft2.def
index 263d360c..01df2e09 100644
--- a/pango/pangoft2.def
+++ b/pango/pangoft2.def
@@ -3,6 +3,7 @@ EXPORTS
 	pango_fc_decoder_get_glyph
 	pango_fc_font_description_from_pattern
 	pango_fc_font_get_glyph
+	pango_fc_font_get_raw_extents
 	pango_fc_font_get_type
 	pango_fc_font_get_unknown_glyph
 	pango_fc_font_has_char
diff --git a/pango/pangowin32.def b/pango/pangowin32.def
index 0e6c7e63..72762c8c 100644
--- a/pango/pangowin32.def
+++ b/pango/pangowin32.def
@@ -6,6 +6,7 @@ EXPORTS
 	pango_win32_font_entry_get_coverage
 	pango_win32_font_entry_remove
 	pango_win32_font_get_glyph_index
+	pango_win32_font_logfont
 	pango_win32_font_map_for_display
 	pango_win32_font_map_get_font_cache
 	pango_win32_font_new
@@ -21,5 +22,6 @@ EXPORTS
 	pango_win32_render
 	pango_win32_render_layout
 	pango_win32_render_layout_line
-	pango_win32_shutdown_display
 	pango_win32_render_transformed
+	pango_win32_shutdown_display
+