diff options
author | Tor Lillqvist <tml@iki.fi> | 2000-12-21 19:55:23 +0000 |
---|---|---|
committer | Tor Lillqvist <tml@src.gnome.org> | 2000-12-21 19:55:23 +0000 |
commit | 503b8075e06612904dcf294e156e89b131c5d948 (patch) | |
tree | c75beae4f97bf66f860ad4d77eb9ea413ecbe62d | |
parent | e763eba74d05d9b8948cd5bfa05ab7056f4c52e8 (diff) | |
download | pango-503b8075e06612904dcf294e156e89b131c5d948.tar.gz |
Only a script engine here.
2000-12-21 Tor Lillqvist <tml@iki.fi>
* modules/basic/basic-win32.c (script_engine_load): Only a script
engine here.
* pango/makefile.mingw.in: Add the built pango-enum-types.[ch].
* pango/pango.def
* pango/pangoft2.def: Update.
* pango/opentype/pango-ot.def
* pango/opentype/makefile.mingw.in: New files.
* pango/opentype/Makefile.am (EXTRA_DIST): Add them.
* configure.in (included_modules): Generate
pango/opentype/makefile.mingw.
-rw-r--r-- | ChangeLog | 18 | ||||
-rw-r--r-- | ChangeLog.pre-1-0 | 18 | ||||
-rw-r--r-- | ChangeLog.pre-1-10 | 18 | ||||
-rw-r--r-- | ChangeLog.pre-1-2 | 18 | ||||
-rw-r--r-- | ChangeLog.pre-1-4 | 18 | ||||
-rw-r--r-- | ChangeLog.pre-1-6 | 18 | ||||
-rw-r--r-- | ChangeLog.pre-1-8 | 18 | ||||
-rw-r--r-- | configure.in | 1 | ||||
-rw-r--r-- | modules/basic/basic-win32.c | 4 | ||||
-rw-r--r-- | pango/makefile.mingw.in | 31 | ||||
-rw-r--r-- | pango/opentype/Makefile.am | 4 | ||||
-rw-r--r-- | pango/opentype/makefile.mingw.in | 43 | ||||
-rw-r--r-- | pango/opentype/pango-ot.def | 50 | ||||
-rw-r--r-- | pango/pango.def | 5 | ||||
-rw-r--r-- | pango/pangoft2.def | 2 |
15 files changed, 261 insertions, 5 deletions
@@ -1,3 +1,21 @@ +2000-12-21 Tor Lillqvist <tml@iki.fi> + + * modules/basic/basic-win32.c (script_engine_load): Only a script + engine here. + + * pango/makefile.mingw.in: Add the built pango-enum-types.[ch]. + + * pango/pango.def + * pango/pangoft2.def: Update. + + * pango/opentype/pango-ot.def + * pango/opentype/makefile.mingw.in: New files. + + * pango/opentype/Makefile.am (EXTRA_DIST): Add them. + + * configure.in (included_modules): Generate + pango/opentype/makefile.mingw. + 2000-12-21 Alexander Larsson <alexl@redhat.com> * pango-config.in: diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0 index 873a07c8..82c002e4 100644 --- a/ChangeLog.pre-1-0 +++ b/ChangeLog.pre-1-0 @@ -1,3 +1,21 @@ +2000-12-21 Tor Lillqvist <tml@iki.fi> + + * modules/basic/basic-win32.c (script_engine_load): Only a script + engine here. + + * pango/makefile.mingw.in: Add the built pango-enum-types.[ch]. + + * pango/pango.def + * pango/pangoft2.def: Update. + + * pango/opentype/pango-ot.def + * pango/opentype/makefile.mingw.in: New files. + + * pango/opentype/Makefile.am (EXTRA_DIST): Add them. + + * configure.in (included_modules): Generate + pango/opentype/makefile.mingw. + 2000-12-21 Alexander Larsson <alexl@redhat.com> * pango-config.in: diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 873a07c8..82c002e4 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,21 @@ +2000-12-21 Tor Lillqvist <tml@iki.fi> + + * modules/basic/basic-win32.c (script_engine_load): Only a script + engine here. + + * pango/makefile.mingw.in: Add the built pango-enum-types.[ch]. + + * pango/pango.def + * pango/pangoft2.def: Update. + + * pango/opentype/pango-ot.def + * pango/opentype/makefile.mingw.in: New files. + + * pango/opentype/Makefile.am (EXTRA_DIST): Add them. + + * configure.in (included_modules): Generate + pango/opentype/makefile.mingw. + 2000-12-21 Alexander Larsson <alexl@redhat.com> * pango-config.in: diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2 index 873a07c8..82c002e4 100644 --- a/ChangeLog.pre-1-2 +++ b/ChangeLog.pre-1-2 @@ -1,3 +1,21 @@ +2000-12-21 Tor Lillqvist <tml@iki.fi> + + * modules/basic/basic-win32.c (script_engine_load): Only a script + engine here. + + * pango/makefile.mingw.in: Add the built pango-enum-types.[ch]. + + * pango/pango.def + * pango/pangoft2.def: Update. + + * pango/opentype/pango-ot.def + * pango/opentype/makefile.mingw.in: New files. + + * pango/opentype/Makefile.am (EXTRA_DIST): Add them. + + * configure.in (included_modules): Generate + pango/opentype/makefile.mingw. + 2000-12-21 Alexander Larsson <alexl@redhat.com> * pango-config.in: diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index 873a07c8..82c002e4 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,21 @@ +2000-12-21 Tor Lillqvist <tml@iki.fi> + + * modules/basic/basic-win32.c (script_engine_load): Only a script + engine here. + + * pango/makefile.mingw.in: Add the built pango-enum-types.[ch]. + + * pango/pango.def + * pango/pangoft2.def: Update. + + * pango/opentype/pango-ot.def + * pango/opentype/makefile.mingw.in: New files. + + * pango/opentype/Makefile.am (EXTRA_DIST): Add them. + + * configure.in (included_modules): Generate + pango/opentype/makefile.mingw. + 2000-12-21 Alexander Larsson <alexl@redhat.com> * pango-config.in: diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 873a07c8..82c002e4 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,21 @@ +2000-12-21 Tor Lillqvist <tml@iki.fi> + + * modules/basic/basic-win32.c (script_engine_load): Only a script + engine here. + + * pango/makefile.mingw.in: Add the built pango-enum-types.[ch]. + + * pango/pango.def + * pango/pangoft2.def: Update. + + * pango/opentype/pango-ot.def + * pango/opentype/makefile.mingw.in: New files. + + * pango/opentype/Makefile.am (EXTRA_DIST): Add them. + + * configure.in (included_modules): Generate + pango/opentype/makefile.mingw. + 2000-12-21 Alexander Larsson <alexl@redhat.com> * pango-config.in: diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 873a07c8..82c002e4 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,21 @@ +2000-12-21 Tor Lillqvist <tml@iki.fi> + + * modules/basic/basic-win32.c (script_engine_load): Only a script + engine here. + + * pango/makefile.mingw.in: Add the built pango-enum-types.[ch]. + + * pango/pango.def + * pango/pangoft2.def: Update. + + * pango/opentype/pango-ot.def + * pango/opentype/makefile.mingw.in: New files. + + * pango/opentype/Makefile.am (EXTRA_DIST): Add them. + + * configure.in (included_modules): Generate + pango/opentype/makefile.mingw. + 2000-12-21 Alexander Larsson <alexl@redhat.com> * pango-config.in: diff --git a/configure.in b/configure.in index e81c5c47..c0b76ce6 100644 --- a/configure.in +++ b/configure.in @@ -331,6 +331,7 @@ pango/opentype/Makefile pango/makefile.mingw pango/pango.rc pango/pangoft2.rc +pango/opentype/makefile.mingw modules/Makefile modules/arabic/Makefile modules/basic/Makefile diff --git a/modules/basic/basic-win32.c b/modules/basic/basic-win32.c index b5ae67d2..cc596556 100644 --- a/modules/basic/basic-win32.c +++ b/modules/basic/basic-win32.c @@ -301,9 +301,7 @@ MODULE_ENTRY(script_engine_list) (PangoEngineInfo **engines, PangoEngine * MODULE_ENTRY(script_engine_load) (const char *id) { - if (!strcmp (id, "BasicScriptEngineLangWin32")) - return basic_engine_lang_new (); - else if (!strcmp (id, "BasicScriptEngineWin32")) + if (!strcmp (id, "BasicScriptEngineWin32")) return basic_engine_win32_new (); else return NULL; diff --git a/pango/makefile.mingw.in b/pango/makefile.mingw.in index b27ed386..c410fb0c 100644 --- a/pango/makefile.mingw.in +++ b/pango/makefile.mingw.in @@ -11,8 +11,14 @@ INCLUDES = -I .. -I . DEFINES = -DPANGO_VERSION=\"$(PANGO_VER)\" DEPCFLAGS = $(GLIB_CFLAGS) $(LIBICONV_CFLAGS) $(FRIBIDI_CFLAGS) $(FREETYPE2_CFLAGS) +pango_built_headers= pango-enum-types.h +pango_built_cfiles= pango-enum-types.c + +BUILT_SOURCES=$(pango_built_headers) $(pango_built_cfiles) + all : \ ../config.h \ + $(BUILT_SOURCES) \ pango-$(PANGO_VER).dll \ pangowin32-$(PANGO_VER).dll \ pangoft2-$(PANGO_VER).dll \ @@ -28,6 +34,7 @@ PANGO_OBJS = \ pango-attributes.o \ pango-context.o \ pango-coverage.o \ + pango-enum-types.o \ pango-fontmap.o \ pango-intset.o \ pango-item.o \ @@ -51,6 +58,24 @@ PANGOFT2_OBJS = \ PANGO_QUERYMODULES_OBJS = \ querymodules.o +pango_headers= \ + pango.h \ + pango-attributes.h \ + pango-break.h \ + pango-context.h \ + pango-coverage.h \ + pango-engine.h \ + pango-font.h \ + pango-fontmap.h \ + pango-glyph.h \ + pango-indic.h \ + pango-item.h \ + pango-layout.h \ + pango-modules.h \ + pango-tabs.h \ + pango-types.h \ + pango-utils.h + ../config.h : ../config.h.win32 cp $< $@ @@ -69,6 +94,12 @@ pangoft2-$(PANGO_VER).dll : $(PANGOFT2_OBJS) pangoft2.def pango-querymodules.exe : $(PANGO_QUERYMODULES_OBJS) pango-$(PANGO_VER).dll $(CC) -o $@ $(PANGO_QUERYMODULES_OBJS) -L . -lpango-$(PANGO_VER) $(GLIB_LIBS) +pango-enum-types.h: $(pango_headers) makeenums.pl + perl makeenums.pl include $(pango_headers) > pango-enum-types.h + +pango-enum-types.c: $(pango_headers) makeenums.pl + perl makeenums.pl cfile $(pango_headers) > pango-enum-types.c + test1.exe : test1.o pango-$(PANGO_VER).dll pangowin32-$(PANGO_VER).dll $(CC) -o $@ $(CFLAGS) test1.o -L . -lpango-$(PANGO_VER) -lpangowin32-$(PANGO_VER) $(GLIB_LIBS) $(FRIBIDI_LIBS) -lgdi32 diff --git a/pango/opentype/Makefile.am b/pango/opentype/Makefile.am index 38cbfd23..fa396b59 100644 --- a/pango/opentype/Makefile.am +++ b/pango/opentype/Makefile.am @@ -36,4 +36,6 @@ ottest_LDADD = \ $(FREETYPE_LIBS) EXTRA_DIST = \ - README + README \ + pango-ot.def \ + makefile.mingw.in diff --git a/pango/opentype/makefile.mingw.in b/pango/opentype/makefile.mingw.in new file mode 100644 index 00000000..a3daf0eb --- /dev/null +++ b/pango/opentype/makefile.mingw.in @@ -0,0 +1,43 @@ +TOP = ../../.. + +include $(TOP)/build/win32/make.mingw + +# Possibly override Pango version from build/win32/module.defs +PANGO_VER = @VERSION@ + +OPTIMIZE = -g -Wall + +INCLUDES = -I ../.. -I . +DEFINES = -DPANGO_VERSION=\"$(PANGO_VER)\" +DEPCFLAGS = $(GLIB_CFLAGS) $(FREETYPE2_CFLAGS) + +all : \ + ../../config.h \ + pango-ot-$(PANGO_VER).dll \ + ottest.exe + +PANGO_OT_OBJS = \ + ftxopen.o \ + ftxgdef.o \ + ftxgpos.o \ + pango-ot-info.o \ + pango-ot-ruleset.o \ + ftxgsub.o + +OTTEST_OBJS = \ + ottest.o \ + disasm.o + +../../config.h : ../../config.h.win32 + cp $< $@ + +pango-ot-$(PANGO_VER).dll : $(PANGO_OT_OBJS) pango-ot.def + $(GLIB)/build-dll pango-ot $(PANGO_VER) pango-ot.def $(OPTIMIZE) $(PANGO_OT_OBJS) -L .. -lpango-$(PANGO_VER) $(GLIB_LIBS) $(FREETYPE2_LIBS) + +ottest.exe : $(OTTEST_OBJS) pango-ot-$(PANGO_VER).dll + $(CC) -o $@ $(OTTEST_OBJS) -L . -lpango-ot-$(PANGO_VER) $(GLIB_LIBS) $(FREETYPE2_LIBS) + +# Hack to get an updated makefile.mingw automatically after updating +# makefile.mingw.in. Only for developer use. +makefile.mingw: makefile.mingw.in + sed -e 's,@VER[S]ION@,@VERSION@,' <$< >$@ diff --git a/pango/opentype/pango-ot.def b/pango/opentype/pango-ot.def new file mode 100644 index 00000000..88310a71 --- /dev/null +++ b/pango/opentype/pango-ot.def @@ -0,0 +1,50 @@ +EXPORTS + TT_Done_GDEF_Table + TT_Done_GPOS_Table + TT_Done_GSUB_Table + TT_Done_GSUB_Table + TT_GDEF_Build_ClassDefinition + TT_GDEF_Get_Glyph_Property + TT_GPOS_Add_Feature + TT_GPOS_Apply_String + TT_GPOS_Clear_Features + TT_GPOS_Query_Features + TT_GPOS_Query_Languages + TT_GPOS_Query_Scripts + TT_GPOS_Register_Glyph_Function + TT_GPOS_Register_MM_Function + TT_GPOS_Select_Feature + TT_GPOS_Select_Language + TT_GPOS_Select_Script + TT_GSUB_Add_Feature + TT_GSUB_Add_String + TT_GSUB_Add_String + TT_GSUB_Apply_String + TT_GSUB_Clear_Features + TT_GSUB_Query_Features + TT_GSUB_Query_Languages + TT_GSUB_Query_Scripts + TT_GSUB_Register_Alternate_Function + TT_GSUB_Select_Feature + TT_GSUB_Select_Feature + TT_GSUB_Select_Language + TT_GSUB_Select_Language + TT_GSUB_Select_Script + TT_GSUB_Select_Script + TT_GSUB_String_Done + TT_GSUB_String_New + TT_GSUB_String_Set_Length + TT_Load_GDEF_Table + TT_Load_GPOS_Table + TT_Load_GSUB_Table + TT_Load_GSUB_Table + pango_ot_info_find_feature + pango_ot_info_find_language + pango_ot_info_find_script + pango_ot_info_list_features + pango_ot_info_list_languages + pango_ot_info_list_scripts + pango_ot_info_new + pango_ot_ruleset_add_feature + pango_ot_ruleset_new + pango_ot_ruleset_shape diff --git a/pango/pango.def b/pango/pango.def index 7842759f..7aec2c30 100644 --- a/pango/pango.def +++ b/pango/pango.def @@ -56,6 +56,7 @@ EXPORTS pango_coverage_to_bytes pango_coverage_unref pango_find_map + pango_find_paragraph_boundary pango_font_describe pango_font_description_copy pango_font_description_equal @@ -166,6 +167,8 @@ EXPORTS pango_shape pango_skip_space pango_split_file_list + pango_stretch_get_type + pango_style_get_type pango_tab_array_copy pango_tab_array_free pango_tab_array_get_size @@ -177,3 +180,5 @@ EXPORTS pango_tab_array_resize pango_tab_array_set_tab pango_trim_string + pango_underline_get_type + pango_variant_get_type diff --git a/pango/pangoft2.def b/pango/pangoft2.def index bab9698e..80e3c338 100644 --- a/pango/pangoft2.def +++ b/pango/pangoft2.def @@ -11,8 +11,8 @@ EXPORTS pango_ft2_ft_strerror pango_ft2_get_context pango_ft2_get_coverage + pango_ft2_get_face pango_ft2_get_unknown_glyph - pango_ft2_has_glyph pango_ft2_load_font pango_ft2_n_subfonts pango_ft2_render |