diff options
| author | Tor Lillqvist <tml@iki.fi> | 2001-02-10 00:24:58 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2001-02-10 00:24:58 +0000 |
| commit | d6f9b720674c1eef1f1975d567a8fdf197bc9fc7 (patch) | |
| tree | 7c6cbeb9e84833cc3a59d55c67ad6a2257662f9f /pango/makefile.mingw.in | |
| parent | da18979679966822e231eebdf1c93b2fbdce4818 (diff) | |
| download | pango-d6f9b720674c1eef1f1975d567a8fdf197bc9fc7.tar.gz | |
Use g_win32_get_package_installation_subdirectory(). Use the same
2001-02-10 Tor Lillqvist <tml@iki.fi>
* pango/pango-utils.c (pango_get_sysconf_subdirectory,
pango_get_lib_subdirectory): (Win32): Use
g_win32_get_package_installation_subdirectory(). Use the same
directory structure as on Unix, etc\pango and lib\pango under the
installation "prefix".
* config.h.win32
* pango/makefile.mingw.in: Use mini-fribidi instead of full
FriBiDi.
* pango/pangowin32.c (pango_win32_render_layout_line): Adapt to
changed PangoAttrColor.
* pango/querymodules.c: Include <io.h> for getcwd() prototype.
(query_module): Handle modules with spaces in the path, and
backslashes, use g_strescape() (for Windows).
* pango/mini-fribidi/makefile.mingw: New file
Diffstat (limited to 'pango/makefile.mingw.in')
| -rw-r--r-- | pango/makefile.mingw.in | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/pango/makefile.mingw.in b/pango/makefile.mingw.in index eb6da574..17e9d22a 100644 --- a/pango/makefile.mingw.in +++ b/pango/makefile.mingw.in @@ -9,7 +9,7 @@ OPTIMIZE = -g -Wall INCLUDES = -I .. -I . DEFINES = -DPANGO_VERSION=\"$(PANGO_VER)\" -DEPCFLAGS = $(GLIB_CFLAGS) $(LIBICONV_CFLAGS) $(FRIBIDI_CFLAGS) $(FREETYPE2_CFLAGS) +DEPCFLAGS = $(GLIB_CFLAGS) $(LIBICONV_CFLAGS) $(FREETYPE2_CFLAGS) pango_built_headers= pango-enum-types.h pango_built_cfiles= pango-enum-types.c @@ -83,13 +83,13 @@ module-defs-ft2.c : module-defs-ft2.c.win32 cp $< $@ pango-$(PANGO_VER).dll : $(PANGO_OBJS) pango.def - $(GLIB)/build-dll pango $(PANGO_VER) pango.def $(OPTIMIZE) $(PANGO_OBJS) $(GLIB_LIBS) $(LIBICONV_LIBS) $(FRIBIDI_LIBS) + $(GLIB)/build-dll pango $(PANGO_VER) pango.def $(OPTIMIZE) $(PANGO_OBJS) -L mini-fribidi -lmini-fribidi $(GLIB_LIBS) $(LIBICONV_LIBS) pangowin32-$(PANGO_VER).dll : $(PANGOWIN32_OBJS) pangowin32.def - $(GLIB)/build-dll pangowin32 $(PANGO_VER) pangowin32.def $(OPTIMIZE) $(PANGOWIN32_OBJS) -L . -lpango-$(PANGO_VER) $(GLIB_LIBS) $(FRIBIDI_LIBS) -lgdi32 + $(GLIB)/build-dll pangowin32 $(PANGO_VER) pangowin32.def $(OPTIMIZE) $(PANGOWIN32_OBJS) -L . -lpango-$(PANGO_VER) $(GLIB_LIBS) -lgdi32 pangoft2-$(PANGO_VER).dll : $(PANGOFT2_OBJS) pangoft2.def - $(GLIB)/build-dll pangoft2 $(PANGO_VER) pangoft2.def $(OPTIMIZE) $(PANGOFT2_OBJS) -L . -lpango-$(PANGO_VER) $(GLIB_LIBS) $(FRIBIDI_LIBS) $(FREETYPE2_LIBS) -lgdi32 + $(GLIB)/build-dll pangoft2 $(PANGO_VER) pangoft2.def $(OPTIMIZE) $(PANGOFT2_OBJS) -L . -lpango-$(PANGO_VER) $(GLIB_LIBS) $(FREETYPE2_LIBS) -lgdi32 pango-querymodules.exe : $(PANGO_QUERYMODULES_OBJS) pango-$(PANGO_VER).dll $(CC) -o $@ $(PANGO_QUERYMODULES_OBJS) -L . -lpango-$(PANGO_VER) $(GLIB_LIBS) @@ -101,7 +101,7 @@ 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 + $(CC) -o $@ $(CFLAGS) test1.o -L . -lpango-$(PANGO_VER) -lpangowin32-$(PANGO_VER) $(GLIB_LIBS) -lgdi32 test2.exe : test2.o $(CC) -o $@ $(CFLAGS) test2.o -lgdi32 @@ -115,7 +115,9 @@ test4.exe : test4.o pango-$(PANGO_VER).dll pangowin32-$(PANGO_VER).dll test5.exe : test5.o $(CC) -o $@ $(CFLAGS) test5.o -lgdi32 +ifeq ($(wildcard makefile.mingw.in),makefile.mingw.in) # 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@,' <$< >$@ +endif |