diff options
author | Hans Breuer <hans@breuer.org> | 2001-05-06 13:58:53 +0000 |
---|---|---|
committer | Hans Breuer <hans@src.gnome.org> | 2001-05-06 13:58:53 +0000 |
commit | f10f21057c5fb0626ec16a2e743c68f6f7ee2cab (patch) | |
tree | 5ee2b7007984745d329f0bddd258f59e6de16a41 /pango/makefile.msc | |
parent | ff742696f6b093aad1384d879405f51da3b220d3 (diff) | |
download | pango-f10f21057c5fb0626ec16a2e743c68f6f7ee2cab.tar.gz |
reflect new version number, removed external fribidi dependency from link
2001-01-06 Hans Breuer <hans@breuer.org>
* pango/makefile.msc : reflect new version number, removed
external fribidi dependency from link step as well
* pango/pango.def : updated externals
* pango/pangowin32.c : initialize approximate_(digit|char)_width
similar to what the other backends do
Diffstat (limited to 'pango/makefile.msc')
-rw-r--r-- | pango/makefile.msc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pango/makefile.msc b/pango/makefile.msc index 8bdad901..3e8a8d5d 100644 --- a/pango/makefile.msc +++ b/pango/makefile.msc @@ -6,11 +6,11 @@ PERL = perl !ENDIF # Possibly override Pango version from build/win32/module.defs -PANGO_VER = 0.13 +PANGO_VER = 0.16 # INCLUDES = -I .. -I . # DEFINES = -# DEPCFLAGS = $(GLIB_CFLAGS) $(LIBICONV_CFLAGS) $(FRIBIDI_CFLAGS) $(FREETYPE2_CFLAGS) +# DEPCFLAGS = $(GLIB_CFLAGS) $(LIBICONV_CFLAGS) $(FREETYPE2_CFLAGS) !IFNDEF PACKAGE @@ -38,18 +38,18 @@ PRJ_TOP = .. PKG_VER = $(PANGO_VER) PKG_DEF = $(PACKAGE).def -PKG_CFLAGS = -I.. -I. -I$(PRJ_TOP) $(GLIB_CFLAGS) $(LIBICONV_CFLAGS) $(FRIBIDI_CFLAGS) $(FREETYPE2_CFLAGS) +PKG_CFLAGS = -I.. -I. -I$(PRJ_TOP) $(GLIB_CFLAGS) $(LIBICONV_CFLAGS) $(FREETYPE2_CFLAGS) !IFDEF OBJS_pango # don't link with itself -PKG_LINK = $(GLIB_LIBS) $(FRIBIDI_LIBS) +PKG_LINK = $(GLIB_LIBS) !ELSE #not yet $(FREETYPE2_LIBS) !IFDEF OBJS_pangowin32 -PKG_LINK = $(GLIB_LIBS) $(LIBICONV_LIBS) $(FRIBIDI_LIBS) \ +PKG_LINK = $(GLIB_LIBS) $(LIBICONV_LIBS) \ pango-$(PANGO_VER).lib !ELSE -PKG_LINK = $(GLIB_LIBS) $(LIBICONV_LIBS) $(FRIBIDI_LIBS) \ +PKG_LINK = $(GLIB_LIBS) $(LIBICONV_LIBS) \ pango-$(PANGO_VER).lib pangowin32-$(PANGO_VER).lib !ENDIF !ENDIF |