diff options
| -rw-r--r-- | configure.ac | 13 | ||||
| -rw-r--r-- | modules/Makefile.am | 1 | ||||
| -rw-r--r-- | modules/basic/Makefile.am | 36 | ||||
| -rw-r--r-- | pango/Makefile.am | 11 | ||||
| -rw-r--r-- | pango/pangocoretext-shape.c (renamed from modules/basic/basic-coretext.c) | 1 | ||||
| -rw-r--r-- | pango/pangofc-shape.c (renamed from modules/basic/basic-fc.c) | 0 | ||||
| -rw-r--r-- | pango/pangowin32-shape.c (renamed from modules/basic/basic-win32.c) | 0 |
7 files changed, 9 insertions, 53 deletions
diff --git a/configure.ac b/configure.ac index 82018e72..730a380c 100644 --- a/configure.ac +++ b/configure.ac @@ -258,24 +258,15 @@ fi AM_CONDITIONAL(HAVE_XFT, test "x$with_xft" = xyes && $have_xft ) # -# Checks for Win32 GDI +# Checks for Win32 # have_win32=false -WIN32_LIBS="" -WIN32_CFLAGS="" # The following doesn't work with autoconf-2.13, so we check $host instead # AC_CHECK_LIB(gdi32, GetTextMetricsA@8, have_win32=true, : ) case "$host" in *-*-mingw*|*-*-cygwin*) have_win32=true ;; esac - - -if test $have_win32 = true; then - WIN32_LIBS="-lgdi32" -fi - -AC_SUBST(WIN32_LIBS) -AM_CONDITIONAL(HAVE_WIN32, $have_win32) +AM_CONDITIONAL(HAVE_WIN32, $have_win32) # Ensure MSVC-compatible struct packing convention is used when # compiling for Win32 with gcc. diff --git a/modules/Makefile.am b/modules/Makefile.am index be8e285e..fa58389e 100644 --- a/modules/Makefile.am +++ b/modules/Makefile.am @@ -2,7 +2,6 @@ SUBDIRS = \ arabic \ - basic \ indic \ thai diff --git a/modules/basic/Makefile.am b/modules/basic/Makefile.am deleted file mode 100644 index 22d657b2..00000000 --- a/modules/basic/Makefile.am +++ /dev/null @@ -1,36 +0,0 @@ -INCLUDES = \ - -DG_LOG_DOMAIN=\"Pango\" \ - -DPANGO_ENABLE_ENGINE \ - $(PANGO_DEBUG_FLAGS) \ - -I$(top_srcdir) \ - -I$(top_srcdir)/pango \ - $(GLIB_CFLAGS) - -noinst_LTLIBRARIES = - -if HAVE_FREETYPE -INCLUDES += $(FREETYPE_CFLAGS) $(HARFBUZZ_CFLAGS) -noinst_LTLIBRARIES += libpango-basic-fc.la -endif - -libpango_basic_fc_la_SOURCES = basic-fc.c -libpango_basic_fc_la_CFLAGS = -DPANGO_MODULE_PREFIX=_pango_basic_fc - - -if HAVE_WIN32 -noinst_LTLIBRARIES += libpango-basic-win32.la -endif - -libpango_basic_win32_la_LIBADD = -lgdi32 -lusp10 -libpango_basic_win32_la_SOURCES = basic-win32.c -libpango_basic_win32_la_CFLAGS = -DPANGO_MODULE_PREFIX=_pango_basic_win32 - -if HAVE_CORE_TEXT -INCLUDES += $(CAIRO_CFLAGS) -noinst_LTLIBRARIES += libpango-basic-coretext.la -endif - -libpango_basic_coretext_la_SOURCES = basic-coretext.c -libpango_basic_coretext_la_CFLAGS = -DPANGO_MODULE_PREFIX=_pango_basic_coretext - --include $(top_srcdir)/git.mk diff --git a/pango/Makefile.am b/pango/Makefile.am index 3e22ae86..d1561e23 100644 --- a/pango/Makefile.am +++ b/pango/Makefile.am @@ -183,6 +183,7 @@ pangoft2_public_sources = \ pangofc-font.c \ pangofc-fontmap.c \ pangofc-decoder.c \ + pangofc-shape.c \ pangoft2.c libpangoft2_1_0_la_LDFLAGS = $(LIBRARY_LIBTOOL_OPTIONS) @@ -321,8 +322,8 @@ pangocairo-win32-res.o: pangocairo.rc $(AM_V_GEN) $(WINDRES) $< $@ -libpangocairo_1_0_la_LIBADD += libpangowin32-$(PANGO_API_VERSION).la $(WIN32_LIBS) -libpangocairo_1_0_la_DEPENDENCIES += libpangowin32-$(PANGO_API_VERSION).la +libpangocairo_1_0_la_LIBADD += libpangowin32-$(PANGO_API_VERSION).la -lgdi32 +libpangocairo_1_0_la_DEPENDENCIES += libpangowin32-$(PANGO_API_VERSION).la libpangocairo_1_0_la_SOURCES += pangocairo-win32font.c pangocairo-win32fontmap.c pangocairo-win32.h endif @@ -347,6 +348,7 @@ libpangocairo_1_0_la_SOURCES += \ pangocoretext.c \ pangocoretext-private.h \ pangocoretext-fontmap.c \ + pangocoretext-shape.c \ pangocairo-coretext.h \ pangocairo-coretextfont.c \ pangocairo-coretextfont.h \ @@ -391,7 +393,7 @@ libpangowin32_1_0_la_LIBADD = \ libpango-$(PANGO_API_VERSION).la \ $(INCLUDED_WIN32_MODULES) \ $(GLIB_LIBS) \ - $(WIN32_LIBS) + -lgdi32 -lusp10 libpangowin32_1_0_la_DEPENDENCIES = \ libpango-$(PANGO_API_VERSION).la \ $(INCLUDED_WIN32_MODULES) @@ -402,7 +404,8 @@ libpangowin32_1_0_la_SOURCES = \ pangowin32.c \ pangowin32-private.h \ pangowin32-fontcache.c \ - pangowin32-fontmap.c + pangowin32-fontmap.c \ + pangowin32-shape.c if PLATFORM_WIN32 libpangowin32_1_0_la_LDFLAGS += -export-symbols $(srcdir)/pangowin32.def -Wl,pangowin32-win32-res.o diff --git a/modules/basic/basic-coretext.c b/pango/pangocoretext-shape.c index 0e966cd9..ce6a62a5 100644 --- a/modules/basic/basic-coretext.c +++ b/pango/pangocoretext-shape.c @@ -544,4 +544,3 @@ PANGO_MODULE_ENTRY(create) (const char *id) else return NULL; } - diff --git a/modules/basic/basic-fc.c b/pango/pangofc-shape.c index d77dacef..d77dacef 100644 --- a/modules/basic/basic-fc.c +++ b/pango/pangofc-shape.c diff --git a/modules/basic/basic-win32.c b/pango/pangowin32-shape.c index e9d020da..e9d020da 100644 --- a/modules/basic/basic-win32.c +++ b/pango/pangowin32-shape.c |