diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 11 | ||||
| -rw-r--r-- | ChangeLog.pre-1-4 | 11 | ||||
| -rw-r--r-- | ChangeLog.pre-1-6 | 11 | ||||
| -rw-r--r-- | ChangeLog.pre-1-8 | 11 | ||||
| -rw-r--r-- | modules/basic/basic-win32.c | 70 | ||||
| -rw-r--r-- | pango/makefile.msc | 29 | ||||
| -rw-r--r-- | pango/pango.def | 4 |
8 files changed, 146 insertions, 12 deletions
@@ -1,3 +1,14 @@ +2003-07-20 Hans Breuer <hans@breuer.org> + + * pango/makefile.msc : updated to generate libtool + compatible dll names, define the right PANGO_MODULE_PREFIX, + pangoft2 still not build with msvc + + * module/basic-win32.c : some #ifdef's for missing + LANG_* constants to make it compile with msvc50 + + * pango/pango.def : updated externals + 2003-06-25 Matthias Clasen <maclas@gmx.de> diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 3b14ecdc..7159bdda 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,14 @@ +2003-07-20 Hans Breuer <hans@breuer.org> + + * pango/makefile.msc : updated to generate libtool + compatible dll names, define the right PANGO_MODULE_PREFIX, + pangoft2 still not build with msvc + + * module/basic-win32.c : some #ifdef's for missing + LANG_* constants to make it compile with msvc50 + + * pango/pango.def : updated externals + 2003-06-25 Matthias Clasen <maclas@gmx.de> diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index 3b14ecdc..7159bdda 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,14 @@ +2003-07-20 Hans Breuer <hans@breuer.org> + + * pango/makefile.msc : updated to generate libtool + compatible dll names, define the right PANGO_MODULE_PREFIX, + pangoft2 still not build with msvc + + * module/basic-win32.c : some #ifdef's for missing + LANG_* constants to make it compile with msvc50 + + * pango/pango.def : updated externals + 2003-06-25 Matthias Clasen <maclas@gmx.de> diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 3b14ecdc..7159bdda 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,14 @@ +2003-07-20 Hans Breuer <hans@breuer.org> + + * pango/makefile.msc : updated to generate libtool + compatible dll names, define the right PANGO_MODULE_PREFIX, + pangoft2 still not build with msvc + + * module/basic-win32.c : some #ifdef's for missing + LANG_* constants to make it compile with msvc50 + + * pango/pango.def : updated externals + 2003-06-25 Matthias Clasen <maclas@gmx.de> diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 3b14ecdc..7159bdda 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,14 @@ +2003-07-20 Hans Breuer <hans@breuer.org> + + * pango/makefile.msc : updated to generate libtool + compatible dll names, define the right PANGO_MODULE_PREFIX, + pangoft2 still not build with msvc + + * module/basic-win32.c : some #ifdef's for missing + LANG_* constants to make it compile with msvc50 + + * pango/pango.def : updated externals + 2003-06-25 Matthias Clasen <maclas@gmx.de> diff --git a/modules/basic/basic-win32.c b/modules/basic/basic-win32.c index 83fa12ca..c63a016a 100644 --- a/modules/basic/basic-win32.c +++ b/modules/basic/basic-win32.c @@ -303,23 +303,35 @@ lang_name (int lang) { #define CASE(n) case LANG_##n: return #n CASE (NEUTRAL); +#ifdef LANG_INVARIANT CASE (INVARIANT); +#endif CASE (AFRIKAANS); CASE (ALBANIAN); CASE (ARABIC); +#ifdef LANG_ARMENIAN CASE (ARMENIAN); +#endif +#ifdef LANG_ASSAMESE CASE (ASSAMESE); +#endif +#ifdef LANG_AZERI CASE (AZERI); +#endif CASE (BASQUE); CASE (BELARUSIAN); +#ifdef LANG_BENGALI CASE (BENGALI); +#endif CASE (BULGARIAN); CASE (CATALAN); CASE (CHINESE); CASE (CROATIAN); CASE (CZECH); CASE (DANISH); +#ifdef LANG_DIVEHI CASE (DIVEHI); +#endif CASE (DUTCH); CASE (ENGLISH); CASE (ESTONIAN); @@ -327,56 +339,110 @@ lang_name (int lang) CASE (FARSI); CASE (FINNISH); CASE (FRENCH); +#ifdef LANG_GALICIAN CASE (GALICIAN); +#endif +#ifdef LANG_GEORGIAN CASE (GEORGIAN); +#endif CASE (GERMAN); CASE (GREEK); +#ifdef LANG_GUJARATI CASE (GUJARATI); +#endif CASE (HEBREW); +#ifdef LANG_HINDI CASE (HINDI); +#endif CASE (HUNGARIAN); CASE (ICELANDIC); CASE (INDONESIAN); CASE (ITALIAN); CASE (JAPANESE); +#ifdef LANG_KANNADA CASE (KANNADA); +#endif +#ifdef LANG_KASHMIRI CASE (KASHMIRI); +#endif +#ifdef LANG_KAZAK CASE (KAZAK); +#endif +#ifdef LANG_KONKANI CASE (KONKANI); +#endif CASE (KOREAN); +#ifdef LANG_KYRGYZ CASE (KYRGYZ); +#endif CASE (LATVIAN); CASE (LITHUANIAN); +#ifdef LANG_MACEDONIAN CASE (MACEDONIAN); +#endif +#ifdef LANG_MALAY CASE (MALAY); +#endif +#ifdef LANG_MALAYALAM CASE (MALAYALAM); +#endif +#ifdef LANG_MANIPURI CASE (MANIPURI); +#endif +#ifdef LANG_MARATHI CASE (MARATHI); +#endif +#ifdef LANG_MONGOLIAN CASE (MONGOLIAN); +#endif +#ifdef LANG_NEPALI CASE (NEPALI); +#endif CASE (NORWEGIAN); +#ifdef LANG_ORIYA CASE (ORIYA); +#endif CASE (POLISH); CASE (PORTUGUESE); +#ifdef LANG_PUNJABI CASE (PUNJABI); +#endif CASE (ROMANIAN); CASE (RUSSIAN); +#ifdef LANG_SANSKRIT CASE (SANSKRIT); +#endif +#ifdef LANG_SINDHI CASE (SINDHI); +#endif CASE (SLOVAK); CASE (SLOVENIAN); CASE (SPANISH); +#ifdef LANG_SWAHILI CASE (SWAHILI); +#endif CASE (SWEDISH); +#ifdef LANG_SYRIAC CASE (SYRIAC); +#endif +#ifdef LANG_TAMIL CASE (TAMIL); +#endif +#ifdef LANG_TATAR CASE (TATAR); +#endif +#ifdef LANG_TELUGU CASE (TELUGU); +#endif CASE (THAI); CASE (TURKISH); CASE (UKRAINIAN); +#ifdef LANG_URDU CASE (URDU); +#endif +#ifdef LANG_UZBEK CASE (UZBEK); +#endif CASE (VIETNAMESE); #undef CASE default: @@ -1067,6 +1133,10 @@ init_uniscribe (void) #endif } +/* The following three functions provide the public module API for + * Pango + */ + void PANGO_MODULE_ENTRY(list) (PangoEngineInfo **engines, gint *n_engines) diff --git a/pango/makefile.msc b/pango/makefile.msc index 3ee3a239..8c41a666 100644 --- a/pango/makefile.msc +++ b/pango/makefile.msc @@ -6,7 +6,8 @@ PERL = perl !ENDIF # Possibly override Pango version from build/win32/module.defs -PANGO_VER = 0.24 +PANGO_VER = 1.0 +PANGO_MODULE_VERSION = 1.0.0 # INCLUDES = -I .. -I . # DEFINES = -DPACKAGE=\"Pango\" -DVERSION=\"$(PANGO_VER)\" @@ -31,7 +32,7 @@ sub-one-lib: nmake -nologo -f makefile.msc $(THIS)-$(PANGO_VER)s.lib PACKAGE=$(THIS) OBJS_$(THIS)=1 sub-one-dll: - nmake -nologo -f makefile.msc $(THIS)-$(PANGO_VER).dll PACKAGE=$(THIS) OBJS_$(THIS)=1 + nmake -nologo -f makefile.msc lib$(THIS)-$(PANGO_VER)-0.dll PACKAGE=$(THIS) OBJS_$(THIS)=1 sub-one-exe: nmake -nologo -f makefile.msc $(THIS).exe PACKAGE=$(THIS) OBJS_$(THIS)=1 @@ -45,6 +46,7 @@ PKG_DEF = $(PACKAGE).def 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) \ $(FREETYPE2_CFLAGS) \ $(X11_CFLAGS) -DSYSCONFDIR=\"/etc\" @@ -61,7 +63,8 @@ PKG_LINK = $(GLIB_LIBS) $(LIBICONV_LIBS) \ !IFDEF OBJS_pangoft2 PKG_LINK = $(GLIB_LIBS) $(LIBICONV_LIBS) $(FREETYPE2_LIBS) \ - pango-$(PANGO_VER).lib mini-xft/mini-xft.lib $(DIRENT_LIBS) + pango-$(PANGO_VER).lib $(FONTCONFIG_LIBS) +# ..\fontconfig\fcwin32.lib !ENDIF !IFDEF OBJS_pangox @@ -87,12 +90,14 @@ OBJECTS = \ pango-coverage.obj \ pango-fontset.obj \ pango-fontmap.obj \ + pango-glyph-item.obj \ pango-intset.obj \ pango-item.obj \ pango-markup.obj \ pango-layout.obj \ pango-tabs.obj \ pango-utils.obj \ + pangofc-font.obj \ reorder-items.obj \ shape.obj \ pango-enum-types.obj \ @@ -101,7 +106,7 @@ OBJECTS = \ !ENDIF basic-win32.obj : ..\modules\basic\basic-win32.c - $(CC) $(PKG_CFLAGS) -GD -DWIN32_MODULE_PREFIX -c ..\modules\basic\basic-win32.c + $(CC) $(PKG_CFLAGS) -GD -DPANGO_MODULE_PREFIX=_pango_basic_win32 -c ..\modules\basic\basic-win32.c basic-ft2.obj : ..\modules\basic\basic-ft2.c $(CC) $(PKG_CFLAGS) -GD -DFT2_MODULE_PREFIX -c ..\modules\basic\basic-ft2.c @@ -151,8 +156,11 @@ OBJECTS = \ OBJECTS = $(PACKAGE).obj !ENDIF -module-defs.c : module-defs.c.win32 - copy module-defs.c.win32 module-defs.c +module-defs-win32.c : module-defs-win32.c.win32 + copy module-defs-win32.c.win32 module-defs-win32.c + +module-defs-ft2.c : module-defs-ft2.c.win32 + copy module-defs-ft2.c.win32 module-defs-ft2.c pango_headers= \ pango.h \ @@ -194,8 +202,9 @@ pango-enum-types.c: $(pango_headers) pango-enum-types.h $(PACKAGE)-$(PKG_VER)s.lib : $(OBJECTS) $(PRJ_TOP)\config.h lib /out:$(PACKAGE)-$(PKG_VER)s.lib $(OBJECTS) -$(PACKAGE)-$(PKG_VER).dll : $(OBJECTS) $(PKG_DEF) $(PRJ_TOP)\config.h - $(CC) $(CFLAGS) -LD -Fe$(PACKAGE)-$(PKG_VER).dll $(OBJECTS) $(PKG_LINK) user32.lib gdi32.lib advapi32.lib $(LDFLAGS) /def:$(PKG_DEF) +lib$(PACKAGE)-$(PKG_VER)-0.dll : $(OBJECTS) $(PKG_DEF) $(PRJ_TOP)\config.h + $(CC) $(CFLAGS) -LD -Fe$@ $(OBJECTS) $(PKG_LINK) \ + user32.lib gdi32.lib advapi32.lib $(LDFLAGS) /implib:$(PACKAGE)-$(PKG_VER).lib /def:$(PKG_DEF) $(PACKAGE).exe : $(PKG_LINK) $(OBJECTS) $(CC) $(CFLAGS) -Fe$(PACKAGE).exe $(OBJECTS) $(PKG_LINK) gdi32.lib user32.lib @@ -205,10 +214,6 @@ $(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32 copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h -module-defs-win32.c: module-defs-win32.c.win32 - copy module-defs-win32.c.win32 module-defs-win32.c - - .c.obj : $(CC) $(CFLAGS) -GD -c $(PKG_CFLAGS) -DPANGO_VERSION=\"$(PANGO_VER)\" $< diff --git a/pango/pango.def b/pango/pango.def index bd1b0eef..14ddfa2e 100644 --- a/pango/pango.def +++ b/pango/pango.def @@ -7,12 +7,14 @@ EXPORTS pango_attr_iterator_copy pango_attr_iterator_destroy pango_attr_iterator_get + pango_attr_iterator_get_attrs pango_attr_iterator_get_font pango_attr_iterator_next pango_attr_iterator_range pango_attr_language_new pango_attr_list_change pango_attr_list_copy + pango_attr_list_filter pango_attr_list_get_iterator pango_attr_list_get_type pango_attr_list_insert @@ -141,6 +143,8 @@ EXPORTS pango_get_log_attrs pango_get_mirror_char pango_get_sysconf_subdirectory + pango_glyph_item_apply_attrs + pango_glyph_item_split pango_glyph_string_copy pango_glyph_string_extents pango_glyph_string_extents_range |