updatedpango-1-20

2008-11-23  Hans Breuer  <hans@breuer.org>

	* pango/makefile.msc : updated 

svn path=/branches/pango-1-20/; revision=2744

2 files changed, 38 insertions, 19 deletions

diff --git a/ChangeLog b/ChangeLog
index 56b34edd..65122e5b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-11-23  Hans Breuer  <hans@breuer.org>
+
+	* pango/makefile.msc : updated 
+	
 2008-07-02  Behdad Esfahbod  <behdad@gnome.org>
 
 	* === Released 1.20.5 ===
diff --git a/pango/makefile.msc b/pango/makefile.msc
index 76e37294..604e6a4e 100644
--- a/pango/makefile.msc
+++ b/pango/makefile.msc
@@ -12,7 +12,7 @@ PANGO_MODULE_VERSION = 1.6.0
 # INCLUDES = -I .. -I .
 # -DHAVE_USP10_H 
 # DEFINES = -DPACKAGE=\"Pango\" -DVERSION=\"$(PANGO_VER)\" 
-# DEPCFLAGS = $(GLIB_CFLAGS) $(LIBICONV_CFLAGS) $(FREETYPE2_CFLAGS)
+# DEPCFLAGS = $(GLIB_CFLAGS) $(FREETYPE2_CFLAGS)
 
 !IFNDEF PACKAGE
 
@@ -20,8 +20,27 @@ DLLS = pango pangowin32 pangoft2 pangocairo # pangox
 EXES = querymodules testfonts
 #? test1 test2 test3 test4 test5
 
+pango-features.h : makefile.msc
+	echo /* generated by makefile.msc */ > pango-features.h
+	echo #ifndef PANGO_FEATURES_H >> pango-features.h
+	echo #define PANGO_FEATURES_H >> pango-features.h
+	echo #define PANGO_VERSION_MAJOR 1 >> pango-features.h
+	echo #define PANGO_VERSION_MINOR 20 >> pango-features.h
+	echo #define PANGO_VERSION_MICRO 5 >> pango-features.h
+	echo #define PANGO_VERSION_STRING "1.20.5" >> pango-features.h
+	echo #endif /*PANGO_FEATURES_H*/ >> pango-features.h
+
+module-defs-lang.c : makefile.msc
+	echo /* generated by makefile.msc */ > module-defs-lang.c
+	echo #include "modules.h" >> module-defs-lang.c
+	echo PangoIncludedModule _pango_included_lang_modules[] = { >> module-defs-lang.c
+	echo   { NULL, NULL, NULL },  >> module-defs-lang.c
+	echo }; >> module-defs-lang.c
+
 # The main target
 all : \
+	pango-features.h \
+	module-defs-lang.c \
 	sub-all
 
 sub-all: 
@@ -48,7 +67,7 @@ PKG_CFLAGS = -FImsvc_recommended_pragmas.h -I.. -I. -I$(PRJ_TOP) \
 		-DPACKAGE=\"Pango\" -DVERSION=\"$(PANGO_VER)\" \
 		-DPANGO_ENABLE_BACKEND -DPANGO_ENABLE_ENGINE \
 		-DMODULE_VERSION=\"$(PANGO_MODULE_VERSION)\" \
-		$(GLIB_CFLAGS) $(LIBICONV_CFLAGS) \
+		$(GLIB_CFLAGS) \
 		$(X11_CFLAGS)  -DSYSCONFDIR=\"/etc\" \
 		-DPANGO_BINARY_AGE=0 
 
@@ -61,7 +80,7 @@ PKG_LINK = $(GLIB_LIBS) $(FONTCONFIG_LIBS)
 !ENDIF
 
 !IFDEF OBJS_pangowin32
-PKG_LINK = $(GLIB_LIBS) $(LIBICONV_LIBS) \
+PKG_LINK = $(GLIB_LIBS) \
 	pango-$(PANGO_VER).lib
 !ENDIF
 
@@ -69,23 +88,23 @@ PKG_LINK = $(GLIB_LIBS) $(LIBICONV_LIBS) \
 PKG_CFLAGS = $(PKG_CFLAGS) $(FREETYPE2_CFLAGS) $(FONTCONFIG_CFLAGS) \
 	-DPANGO_MODULE_PREFIX=_pango_basic_ft2
 
-PKG_LINK = $(GLIB_LIBS) $(LIBICONV_LIBS) $(FREETYPE2_LIBS) $(FONTCONFIG_LIBS) \
+PKG_LINK = $(GLIB_LIBS) $(FREETYPE2_LIBS) $(FONTCONFIG_LIBS) \
 	pango-$(PANGO_VER).lib opentype\pango-ot.lib
 !ENDIF
 
 !IFDEF OBJS_pangox
-PKG_LINK = $(GLIB_LIBS) $(LIBICONV_LIBS) \
+PKG_LINK = $(GLIB_LIBS) \
 	pango-$(PANGO_VER).lib $(X11_LIBS)
 !ENDIF
 
 !IFDEF OBJS_pangocairo
-PKG_LINK = $(GLIB_LIBS) $(LIBICONV_LIBS) \
+PKG_LINK = $(GLIB_LIBS) \
 	pango-$(PANGO_VER).lib $(CAIRO_LIBS) \
 	pangowin32-$(PANGO_VER).lib $(FONTCONFIG_LIBS) 
 !ENDIF
 
 !IF DEFINED (OBJS_querymodules) || DEFINED (OBJS_testfonts)
-PKG_LINK = $(GLIB_LIBS) $(LIBICONV_LIBS) \
+PKG_LINK = $(GLIB_LIBS) \
 	pango-$(PANGO_VER).lib pangowin32-$(PANGO_VER).lib
 !ENDIF
 
@@ -99,7 +118,6 @@ OBJECTS = \
 	ellipsize.obj \
 	fonts.obj \
 	glyphstring.obj \
-	mapping.obj \
 	modules.obj \
 	pango-attributes.obj \
 	pango-engine.obj \
@@ -128,24 +146,24 @@ OBJECTS = \
 !ENDIF
 
 basic-win32.obj : ..\modules\basic\basic-win32.c
-	$(CC) $(PKG_CFLAGS) -GD -DPANGO_MODULE_PREFIX=_pango_basic_win32 -c ..\modules\basic\basic-win32.c
+	$(CC) $(PKG_CFLAGS) -DPANGO_MODULE_PREFIX=_pango_basic_win32 -c ..\modules\basic\basic-win32.c
 
 basic-fc.obj : ..\modules\basic\basic-fc.c
-	$(CC) $(PKG_CFLAGS) -GD -DPANGO_MODULE_PREFIX=_pango_basic_ft2 -c ..\modules\basic\basic-fc.c
+	$(CC) $(PKG_CFLAGS) -DPANGO_MODULE_PREFIX=_pango_basic_ft2 -c ..\modules\basic\basic-fc.c
 
 basic-x.obj : ..\modules\basic\basic-x.c
-	$(CC) $(PKG_CFLAGS) -GD -DPANGO_MODULE_PREFIX=_pango_basic_xs -c ..\modules\basic\basic-x.c
+	$(CC) $(PKG_CFLAGS) -DPANGO_MODULE_PREFIX=_pango_basic_xs -c ..\modules\basic\basic-x.c
 
 
 fribidi.obj : mini-fribidi\fribidi.c
-	$(CC) $(PKG_CFLAGS) -GD -c mini-fribidi\fribidi.c
+	$(CC) $(PKG_CFLAGS) -c mini-fribidi\fribidi.c
 fribidi_types.obj : mini-fribidi\fribidi_types.c
-	$(CC) $(PKG_CFLAGS) -GD -c mini-fribidi\fribidi_types.c
+	$(CC) $(PKG_CFLAGS) -c mini-fribidi\fribidi_types.c
 fribidi_char_type.obj : mini-fribidi\fribidi_char_type.c
-	$(CC) $(PKG_CFLAGS) -GD -c mini-fribidi\fribidi_char_type.c
+	$(CC) $(PKG_CFLAGS) -c mini-fribidi\fribidi_char_type.c
 
 testfonts.obj : ..\examples\pangowin32tobmp.c
-	$(CC) $(PKG_CFLAGS) -GD  -Fotestfonts.obj -c ..\examples\pangowin32tobmp.c
+	$(CC) $(PKG_CFLAGS) -Fotestfonts.obj -c ..\examples\pangowin32tobmp.c
 
 !IFDEF OBJS_pangowin32
 PKG_CFLAGS = $(PKG_CFLAGS) -DPANGO_MODULE_PREFIX=_pango_basic_win32
@@ -221,9 +239,6 @@ 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 \
@@ -285,6 +300,6 @@ $(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32
 
 
 .c.obj :
-	$(CC) $(CFLAGS) -GD -c $(PKG_CFLAGS) $<
+	$(CC) $(CFLAGS) -c $(PKG_CFLAGS) $<
 
 !ENDIF #PACKAGE