summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/luatexdir
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2014-10-31 08:42:42 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2014-10-31 08:42:42 +0000
commit087ed5c373fa2208ad2a7060486e49cf0cac3d30 (patch)
tree0d25a980372079c7d6bee067e19e9c1ad7669ee0 /Build/source/texk/web2c/luatexdir
parent2bdc6e0d8bf027221df8e869c992bbcf52238034 (diff)
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
Diffstat (limited to 'Build/source/texk/web2c/luatexdir')
-rw-r--r--Build/source/texk/web2c/luatexdir/ChangeLog5
-rw-r--r--Build/source/texk/web2c/luatexdir/am/luatex.am1
-rw-r--r--Build/source/texk/web2c/luatexdir/luatex.c10
-rw-r--r--Build/source/texk/web2c/luatexdir/luatex.h2
4 files changed, 17 insertions, 1 deletions
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 <peb@mppmu.mpg.de>
+
+ * luatex.[ch] [W32TEX]: Handle DLLPROC as for TeX & Co.
+ * am/luatex.am: Define LuajitTeX.
+
2014-10-13 Peter Breitenlohner <peb@mppmu.mpg.de>
* 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='<synctex-luatex.h
luatex_CPPFLAGS = $(luatex_preflags) $(LUA_INCLUDES) $(luatex_postflags)
luajittex_CPPFLAGS = $(luatex_preflags) $(LUAJIT_INCLUDES) $(LUAJIT_DEFINES) $(luatex_postflags)
+luajittex_CPPFLAGS += -DLuajitTeX
luatex_CXXFLAGS = $(WARNING_CXXFLAGS)
luajittex_CXXFLAGS = $(WARNING_CXXFLAGS)
diff --git a/Build/source/texk/web2c/luatexdir/luatex.c b/Build/source/texk/web2c/luatexdir/luatex.c
index c803b5bb319..1e1e30c1e46 100644
--- a/Build/source/texk/web2c/luatexdir/luatex.c
+++ b/Build/source/texk/web2c/luatexdir/luatex.c
@@ -10,6 +10,14 @@
#defines TeX or MF, which avoids the need for a special
Makefile rule. */
+/* We |#define DLLPROC| in order to build LuaTeX and LuajitTeX as DLL
+ for W32TeX. */
+#if defined LuajitTeX
+#define DLLPROC dllluajittexmain
+#else
+#define DLLPROC dllluatexmain
+#endif
+
#include "ptexlib.h"
#include "luatex.h"
#include "lua/luatex-api.h"
@@ -466,7 +474,7 @@ static void myInvalidParameterHandler(const wchar_t * expression,
happen in `topenin', then call the main body. */
int
-#if defined(WIN32) && !defined(__MINGW32__) && defined(DLLPROC)
+#if defined(DLLPROC)
DLLPROC (int ac, string *av)
#else
main (int ac, string *av)
diff --git a/Build/source/texk/web2c/luatexdir/luatex.h b/Build/source/texk/web2c/luatexdir/luatex.h
index cb205b0314d..f0cf9207af1 100644
--- a/Build/source/texk/web2c/luatexdir/luatex.h
+++ b/Build/source/texk/web2c/luatexdir/luatex.h
@@ -79,6 +79,8 @@ extern int runsystem(const char *cmd);
#if defined(WIN32) && !defined(__MINGW32__) && defined(DLLPROC)
extern __declspec(dllexport) int DLLPROC (int ac, string *av);
+#else
+#undef DLLPROC
#endif
# ifndef GLUERATIO_TYPE