From 087ed5c373fa2208ad2a7060486e49cf0cac3d30 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Fri, 31 Oct 2014 08:42:42 +0000 Subject: texk/web2c/luatexdir [W32TEX]: Handling of luatex.dll and luajittex.dll git-svn-id: svn://tug.org/texlive/trunk@35475 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/Makefile.in | 3 ++- Build/source/texk/web2c/luatexdir/ChangeLog | 5 +++++ Build/source/texk/web2c/luatexdir/am/luatex.am | 1 + Build/source/texk/web2c/luatexdir/luatex.c | 10 +++++++++- Build/source/texk/web2c/luatexdir/luatex.h | 2 ++ 5 files changed, 19 insertions(+), 2 deletions(-) (limited to 'Build') diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in index c225fc76a9b..8271f9be572 100644 --- a/Build/source/texk/web2c/Makefile.in +++ b/Build/source/texk/web2c/Makefile.in @@ -3312,7 +3312,8 @@ luatex_postflags = -I$(srcdir)/libmd5 -DpdfTeX -I$(srcdir)/luatexdir \ -I$(srcdir)/mplibdir -Dextra_version_info=`date +-%Y%m%d%H` \ -I$(srcdir)/synctexdir -DSYNCTEX_ENGINE_H='' luatex_CPPFLAGS = $(luatex_preflags) $(LUA_INCLUDES) $(luatex_postflags) -luajittex_CPPFLAGS = $(luatex_preflags) $(LUAJIT_INCLUDES) $(LUAJIT_DEFINES) $(luatex_postflags) +luajittex_CPPFLAGS = $(luatex_preflags) $(LUAJIT_INCLUDES) \ + $(LUAJIT_DEFINES) $(luatex_postflags) -DLuajitTeX luatex_CXXFLAGS = $(WARNING_CXXFLAGS) luajittex_CXXFLAGS = $(WARNING_CXXFLAGS) luatex_LDFLAGS = -export-dynamic diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog index e52cd2dd724..a35ccb36756 100644 --- a/Build/source/texk/web2c/luatexdir/ChangeLog +++ b/Build/source/texk/web2c/luatexdir/ChangeLog @@ -1,3 +1,8 @@ +2014-10-31 Peter Breitenlohner + + * luatex.[ch] [W32TEX]: Handle DLLPROC as for TeX & Co. + * am/luatex.am: Define LuajitTeX. + 2014-10-13 Peter Breitenlohner * luatex.[ch]: More sync with ../texmfmp.h and ../lib/texmfmp.c. diff --git a/Build/source/texk/web2c/luatexdir/am/luatex.am b/Build/source/texk/web2c/luatexdir/am/luatex.am index 40a032a7afb..8243019182a 100644 --- a/Build/source/texk/web2c/luatexdir/am/luatex.am +++ b/Build/source/texk/web2c/luatexdir/am/luatex.am @@ -40,6 +40,7 @@ luatex_postflags += -I$(srcdir)/synctexdir -DSYNCTEX_ENGINE_H='