summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2009-05-06 08:43:08 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2009-05-06 08:43:08 +0000
commit1c799a0a0ea18ea76e50e369abe1220fdf1b82a2 (patch)
tree5e909cbdc2bbd203594aebcbdbba0f04745ad636
parent72351c3e68ec7574a578bd41f7a0b17578d857af (diff)
fix cygwin build of XeTeX
git-svn-id: svn://tug.org/texlive/trunk@12944 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/web2c/Makefile.in7
-rw-r--r--Build/source/texk/web2c/xetexdir/ChangeLog6
-rw-r--r--Build/source/texk/web2c/xetexdir/am/xetex.am2
3 files changed, 11 insertions, 4 deletions
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index 8cca5b4ab38..8d9f5959f81 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -1743,9 +1743,10 @@ libluatex_a_SOURCES = \
EXTRA_libluatex_a_SOURCES = luatexdir/font/macnames.c
nodist_EXTRA_xetex_SOURCES = dummy.cxx
libxetex = libxetex.a $(am__append_15)
-xetex_cppflags = -DLE_USE_CMEMORY -I$(srcdir)/xetexdir $(ICU_INCLUDES) \
- $(TECKIT_INCLUDES) $(am__append_14) $(am__append_16) \
- $(am__append_19) $(FREETYPE2_INCLUDES) $(ZLIB_INCLUDES)
+xetex_cppflags = -DU_STATIC_IMPLEMENTATION -I$(srcdir)/xetexdir \
+ $(ICU_INCLUDES) $(TECKIT_INCLUDES) $(am__append_14) \
+ $(am__append_16) $(am__append_19) $(FREETYPE2_INCLUDES) \
+ $(ZLIB_INCLUDES)
xetex_ldadd = $(libxetex) $(ICU_LIBS) $(TECKIT_LIBS) $(am__append_17) \
$(am__append_20) $(FREETYPE2_LIBS) $(ZLIB_LIBS)
xetex_dependencies = $(proglib) $(ICU_DEPEND) $(TECKIT_DEPEND) \
diff --git a/Build/source/texk/web2c/xetexdir/ChangeLog b/Build/source/texk/web2c/xetexdir/ChangeLog
index df1b2896a5e..2c0d96d8afc 100644
--- a/Build/source/texk/web2c/xetexdir/ChangeLog
+++ b/Build/source/texk/web2c/xetexdir/ChangeLog
@@ -1,5 +1,11 @@
2009-05-05 Peter Breitenlohner <peb@mppmu.mpg.de>
+ * am/xetex.am: in CPPFLAGS define U_STATIC_IMPLEMENTATION
+ instead of DLE_USE_CMEMORY, required for Cygwin but also works for
+ others.
+
+2009-05-05 Peter Breitenlohner <peb@mppmu.mpg.de>
+
* XeTeX_ext.c, image/pdfimage.cpp: adapt for poppler.
patches from Norbert Preinig <preining@logic.at>
diff --git a/Build/source/texk/web2c/xetexdir/am/xetex.am b/Build/source/texk/web2c/xetexdir/am/xetex.am
index bf8bad87a56..836647f4b86 100644
--- a/Build/source/texk/web2c/xetexdir/am/xetex.am
+++ b/Build/source/texk/web2c/xetexdir/am/xetex.am
@@ -15,7 +15,7 @@ nodist_EXTRA_xetex_SOURCES = dummy.cxx
libxetex = libxetex.a
-xetex_cppflags = -DLE_USE_CMEMORY -I$(srcdir)/xetexdir
+xetex_cppflags = -DU_STATIC_IMPLEMENTATION -I$(srcdir)/xetexdir
xetex_cppflags += $(ICU_INCLUDES) $(TECKIT_INCLUDES)
xetex_ldadd = $(libxetex) $(ICU_LIBS) $(TECKIT_LIBS)
xetex_dependencies = $(proglib)