updated

2007-01-13  Hans Breuer  <hans@breuer.org>

	* pango/makefile.msc pango/opentype/makefile.msc : updated

svn path=/trunk/; revision=2139

diff --git a/ChangeLog b/ChangeLog
index 686c989..bf4499f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-01-13  Hans Breuer  <hans@breuer.org>
+
+       * pango/makefile.msc pango/opentype/makefile.msc : updated
+
 2007-01-08  Behdad Esfahbod  <behdad@gnome.org>
 
        * === Released 1.15.3 ===

diff --git a/pango/makefile.msc b/pango/makefile.msc
index 8caaad3..de857b3 100644 (file)
--- a/pango/makefile.msc
+++ b/pango/makefile.msc
@@ -7,7 +7,7 @@ PERL = perl
 
 # Possibly override Pango version from build/win32/module.defs
 PANGO_VER = 1.0
-PANGO_MODULE_VERSION = 1.2.0
+PANGO_MODULE_VERSION = 1.6.0
 
 # INCLUDES = -I .. -I .
 # DEFINES = -DPACKAGE=\"Pango\" -DVERSION=\"$(PANGO_VER)\"
@@ -88,6 +88,8 @@ PKG_LINK = $(GLIB_LIBS) $(LIBICONV_LIBS) \
 OBJECTS = \
        pango-enum-types.obj \
        \
+       module-defs-lang.obj \
+       \
        break.obj \
        ellipsize.obj \
        fonts.obj \
@@ -207,6 +209,9 @@ module-defs-win32.c : module-defs-win32.c.win32
 module-defs-fc.c : module-defs-fc.c.win32
        copy module-defs-fc.c.win32 module-defs-fc.c
 
+module-defs-lang.c : module-defs-lang.c.win32
+       copy module-defs-lang.c.win32 module-defs-lang.c
+
 pango_headers=            \
        pango.h            \
        pango-attributes.h \
@@ -265,6 +270,6 @@ $(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32
 
 
 .c.obj :
-       $(CC) $(CFLAGS) -GD -c $(PKG_CFLAGS) -DPANGO_VERSION=\"$(PANGO_VER)\" $<
+       $(CC) $(CFLAGS) -GD -c $(PKG_CFLAGS) $<
 
 !ENDIF #PACKAGE

diff --git a/pango/opentype/makefile.msc b/pango/opentype/makefile.msc
index fedfbf3..2943883 100644 (file)
--- a/pango/opentype/makefile.msc
+++ b/pango/opentype/makefile.msc
@@ -5,16 +5,12 @@ INCLUDES = -I . -I ..\.. $(FREETYPE2_CFLAGS) $(GLIB_CFLAGS)
 DEFINES = -DPANGO_ENABLE_ENGINE
 
 OBJECTS = \
-       ftxgdef.obj \
-       disasm.obj \
-       ftxgpos.obj \
-       ftxgsub.obj \
-       ftxopen.obj \
-       otlbuffer.obj \
-#      ottest.obj \
-       pango-ot-buffer.obj \
-       pango-ot-info.obj \
-       pango-ot-ruleset.obj \
+       ftglue.obj \
+       harfbuzz-buffer.obj \
+       harfbuzz-gdef.obj \
+       harfbuzz-gpos.obj \
+       harfbuzz-gsub.obj \
+       harfbuzz-open.obj \
 
 all : \
        pango-ot.lib