diff options
| author | Hans Breuer <hans@breuer.org> | 2003-12-13 14:31:50 +0000 |
|---|---|---|
| committer | Hans Breuer <hans@src.gnome.org> | 2003-12-13 14:31:50 +0000 |
| commit | 57d17e74dc8861396b465d602a8f2eda513d0d61 (patch) | |
| tree | 60b409039d867261f3b025857d3bcebd15174c61 /modules | |
| parent | bcbb2cad9eee80f00ea25fd879347544f62a5a03 (diff) | |
| download | pango-57d17e74dc8861396b465d602a8f2eda513d0d61.tar.gz | |
moved pango_fc_* to the latter where they live on *nix too.
2003-12-13 Hans Breuer <hans@breuer.org>
* pango/pango.def pangoft2.def : moved pango_fc_*
to the latter where they live on *nix too.
* pango/makefile.msc : make it build again (including
the Ft2 backend)
* pango/module-defs-fc.c.win32 : if PANGO_MODULE_PREFIX is defined
include the basic backend shaper
* pango/pangowin32.c (pango_win32_render_layout) :
initialize iter before first usage to avoid immediate crashing
* pango/opentype/makefile.msc
pango/modules/makefile.msc : finally build with mscv, too.
[completely untested cause I'm not able to type, write or read
any of these languages]
* modules/modules.def : follow module function renaming/changes
* modules/basic/basic-win32.c : register the right engine, i.e.
make it compile
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/basic/basic-win32.c | 2 | ||||
| -rw-r--r-- | modules/makefile.msc | 55 | ||||
| -rw-r--r-- | modules/module.def | 5 |
3 files changed, 59 insertions, 3 deletions
diff --git a/modules/basic/basic-win32.c b/modules/basic/basic-win32.c index e858f71d..1d50c8c5 100644 --- a/modules/basic/basic-win32.c +++ b/modules/basic/basic-win32.c @@ -1127,7 +1127,7 @@ PANGO_MODULE_ENTRY(init) (GTypeModule *module) if (pango_win32_get_debug_flag ()) pango_win32_debug = TRUE; - basic_engine_register_type (module); + basic_engine_win32_register_type (module); } void diff --git a/modules/makefile.msc b/modules/makefile.msc new file mode 100644 index 00000000..eef35ba9 --- /dev/null +++ b/modules/makefile.msc @@ -0,0 +1,55 @@ +# modles for the ft2 backend, don't include 'basic' +# here it is built-in pangoft.dll, see ../pango/makefile.msc +MODULES = arabic hangul hebrew indic thai + +!IFNDEF MODULE + +# The main target +all : sub-all + +sub-all: + for %d in ($(MODULES)) do nmake -nologo -f makefile.msc sub-one THIS=%d + +sub-one: + cd $(THIS) + nmake -nologo -f ..\makefile.msc libpango-$(THIS)-fc.dll MODULE=$(THIS) OBJ_$(THIS)=1 + cd .. + +clean: + for %d in ($(MODULE)) do nmake -nologo -f makefile.msc sub-clean THIS=%d + +!ELSE + +TOP = ..\..\.. +!INCLUDE $(TOP)\glib\build\win32\make.msc + +!IFDEF OBJ_arabic +OBJECTS = arabic-fc.obj arabic-ot.obj +!ENDIF + +!IFDEF OBJ_hebrew +OBJECTS = hebrew-fc.obj hebrew-shaper.obj +!ENDIF + +!IFDEF OBJ_indic +OBJECTS = indic-fc.obj indic-ot.obj indic-ot-class-tables.obj mprefixups.obj +!ENDIF + +!IFDEF OBJ_thai +OBJECTS = thai-fc.obj thai-shaper.obj +!ENDIF + +!IFNDEF OBJECTS +OBJECTS = $(MODULE)-fc.obj +!ENDIF + +INCLUDES = -I ..\.. -I ..\..\pango $(GLIB_CFLAGS) $(FREETYPE2_CFLAGS) +DEFINES = -DPANGO_ENABLE_ENGINE +LINKS = $(FREETYPE_LIBS) $(GLIB_LIBS) \ + ..\..\pango\pango-1.0.lib ..\..\pango\pangoft2-1.0.lib + +libpango-$(MODULE)-fc.dll : $(OBJECTS) ..\module.def + $(CC) $(CFLAGS) -LD -Fe$@ $(OBJECTS) $(LINKS) $(LDFLAGS) /def:..\module.def + +# MODULE +!ENDIF
\ No newline at end of file diff --git a/modules/module.def b/modules/module.def index 23572855..6e673874 100644 --- a/modules/module.def +++ b/modules/module.def @@ -1,4 +1,5 @@ EXPORTS + script_engine_create script_engine_list - script_engine_load - script_engine_unload + script_engine_init + script_engine_exit |