diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/hangul/Makefile.am | 6 | ||||
| -rw-r--r-- | modules/indic/Makefile.am | 5 | ||||
| -rw-r--r-- | modules/thai/Makefile.am | 6 | ||||
| -rw-r--r-- | modules/thai/thai-shaper.c | 2 | ||||
| -rw-r--r-- | modules/thai/thai-shaper.h | 4 |
5 files changed, 19 insertions, 4 deletions
diff --git a/modules/hangul/Makefile.am b/modules/hangul/Makefile.am index a4047f3b..a83aae54 100644 --- a/modules/hangul/Makefile.am +++ b/modules/hangul/Makefile.am @@ -13,6 +13,10 @@ INCLUDES = \ -I$(top_srcdir)/pango/ \ $(GLIB_CFLAGS) +if PLATFORM_WIN32 +no_undefined = -no-undefined +endif + moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules module_LTLIBRARIES = noinst_LTLIBRARIES = @@ -65,7 +69,7 @@ endif ft2_sources = hangul-fc.c hangul-defs.h -pango_hangul_ft2_la_LDFLAGS = -export-dynamic -avoid-version -module +pango_hangul_ft2_la_LDFLAGS = -export-dynamic -avoid-version -module $(no_undefined) pango_hangul_ft2_la_LIBADD = $(pangoft2libs) pango_hangul_ft2_la_SOURCES = $(ft2_sources) pango_hangul_ft2_la_CFLAGS = -DBUILD_FT2 diff --git a/modules/indic/Makefile.am b/modules/indic/Makefile.am index 42912836..bc55ad7e 100644 --- a/modules/indic/Makefile.am +++ b/modules/indic/Makefile.am @@ -13,6 +13,9 @@ INCLUDES = \ -I$(top_srcdir)/pango/ \ $(GLIB_CFLAGS) +if PLATFORM_WIN32 +no_undefined = -no-undefined +endif moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules module_LTLIBRARIES = @@ -120,7 +123,7 @@ ft2_sources = \ indic-ot.c \ indic-ot.h -pango_indic_ft2_la_LDFLAGS = -export-dynamic -avoid-version -module +pango_indic_ft2_la_LDFLAGS = -export-dynamic -avoid-version -module $(no_undefined) pango_indic_ft2_la_LIBADD = $(pangoft2libs) pango_indic_ft2_la_SOURCES = $(ft2_sources) pango_indic_ft2_la_CFLAGS = -DBUILD_FT2 diff --git a/modules/thai/Makefile.am b/modules/thai/Makefile.am index 82918faf..179c5ffc 100644 --- a/modules/thai/Makefile.am +++ b/modules/thai/Makefile.am @@ -13,6 +13,10 @@ INCLUDES = \ -I$(top_srcdir)/pango/ \ $(GLIB_CFLAGS) +if PLATFORM_WIN32 +no_undefined = -no-undefined +endif + moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules module_LTLIBRARIES = noinst_LTLIBRARIES = @@ -68,7 +72,7 @@ endif thai_ft2_sources = $(common_sources) thai-fc.c -pango_thai_ft2_la_LDFLAGS = -export-dynamic -avoid-version -module +pango_thai_ft2_la_LDFLAGS = -export-dynamic -avoid-version -module $(no_undefined) pango_thai_ft2_la_LIBADD = $(pangoft2libs) pango_thai_ft2_la_SOURCES = $(thai_ft2_sources) pango_thai_ft2_la_CFLAGS = -DBUILD_FT2 diff --git a/modules/thai/thai-shaper.c b/modules/thai/thai-shaper.c index 39e3ee14..fd052dd3 100644 --- a/modules/thai/thai-shaper.c +++ b/modules/thai/thai-shaper.c @@ -25,7 +25,7 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ - +#include "config.h" #include <string.h> diff --git a/modules/thai/thai-shaper.h b/modules/thai/thai-shaper.h index 401a4f78..7a9bb31e 100644 --- a/modules/thai/thai-shaper.h +++ b/modules/thai/thai-shaper.h @@ -1,7 +1,9 @@ #ifndef __THAI_SHAPER_H__ #define __THAI_SHAPER_H__ +#ifdef HAVE_X #include "pangox.h" +#endif #define ucs2tis(wc) (unsigned int)((unsigned int)(wc) - 0x0E00 + 0xA0) #define tis2uni(c) ((gunichar)(c) - 0xA0 + 0x0E00) @@ -28,7 +30,9 @@ struct _ThaiFontInfo { PangoFont *font; ThaiFontSet font_set; +#ifdef HAVE_X PangoXSubfont subfont; /* For X backend */ +#endif }; /* |