diff options
| author | Hans Breuer <hans@breuer.org> | 2005-02-06 19:11:54 +0000 |
|---|---|---|
| committer | Hans Breuer <hans@src.gnome.org> | 2005-02-06 19:11:54 +0000 |
| commit | 69f1774a7df9f7f20564d4f14ff08508d9399133 (patch) | |
| tree | 40e142f97d424f912d32dd827d0d1e34497d58a7 /pango/makefile.msc | |
| parent | caa3dc099505e4584b80c144105c3b26e8cbfd0f (diff) | |
| download | pango-69f1774a7df9f7f20564d4f14ff08508d9399133.tar.gz | |
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
Diffstat (limited to 'pango/makefile.msc')
| -rw-r--r-- | pango/makefile.msc | 23 |
1 files changed, 21 insertions, 2 deletions
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 \ |