texk/web2c [W32TEX]: Handling of tex.dll etc

git-svn-id: svn://tug.org/texlive/trunk@35471 c570f23f-e606-0410-a88d-b1316a301751

8 files changed, 35 insertions, 4 deletions

diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index cac74597106..7ace7a1118b 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-30  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* texmfmp.h: Define here whether or not to build tex*.dll.
+
 2014-10-28  Karl Berry  <karl@tug.org>
 
 	* enctex.ch: patch for \^^ab control sequences from Petr Olsak.
diff --git a/Build/source/texk/web2c/lib/ChangeLog b/Build/source/texk/web2c/lib/ChangeLog
index ab9bcf3d248..131d8da0c0c 100644
--- a/Build/source/texk/web2c/lib/ChangeLog
+++ b/Build/source/texk/web2c/lib/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-30  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* texmfmp.c: Use the decision about tex*.dll from ../texmfmp.h.
+
 2014-10-09  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* texmfmp.c: Apply some code from W32TeX.
diff --git a/Build/source/texk/web2c/lib/texmfmp.c b/Build/source/texk/web2c/lib/texmfmp.c
index a3d7aaa6271..f6bb658370d 100644
--- a/Build/source/texk/web2c/lib/texmfmp.c
+++ b/Build/source/texk/web2c/lib/texmfmp.c
@@ -920,7 +920,7 @@ maininit (int ac, string *av)
    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/mplibdir/ChangeLog b/Build/source/texk/web2c/mplibdir/ChangeLog
index 473e5f532f5..1b48c33ce23 100644
--- a/Build/source/texk/web2c/mplibdir/ChangeLog
+++ b/Build/source/texk/web2c/mplibdir/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-30  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* mpost.w [W32TeX]: Handle building of mpost.dll as for tex & Co.
+
 2014-09-22  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* mp.w: Fixed an error message typo.
diff --git a/Build/source/texk/web2c/mplibdir/mpost.w b/Build/source/texk/web2c/mplibdir/mpost.w
index c5fedb477cd..2ead2724b28 100644
--- a/Build/source/texk/web2c/mplibdir/mpost.w
+++ b/Build/source/texk/web2c/mplibdir/mpost.w
@@ -1284,12 +1284,15 @@ if (options->job_name != NULL) {
 }
 options->job_name = job_name;
 
-@ For W32\TeX we can |#define DLLPROC dllmpostmain| in order to build \MP\
-as DLL.
+@ We |#define DLLPROC dllmpostmain| in order to build \MP\ as DLL for
+W32\TeX.
 
 @<Declarations@>=
+#define DLLPROC dllmpostmain
 #if defined(WIN32) && !defined(__MINGW32__) && defined(DLLPROC)
 extern __declspec(dllexport) int DLLPROC (int argc, char **argv);
+#else
+#undef DLLPROC
 #endif
 
 @ Now this is really it: \MP\ starts and ends here.
@@ -1307,7 +1310,7 @@ static char *cleaned_invocation_name(char *arg)
     return ret;
 }
 int
-#if defined(WIN32) && !defined(__MINGW32__) && defined(DLLPROC)
+#if defined(DLLPROC)
 DLLPROC (int argc, char **argv)
 #else
 main (int argc, char **argv)
diff --git a/Build/source/texk/web2c/pmpostdir/ChangeLog b/Build/source/texk/web2c/pmpostdir/ChangeLog
index ad7bb5eac99..7865fcbde62 100644
--- a/Build/source/texk/web2c/pmpostdir/ChangeLog
+++ b/Build/source/texk/web2c/pmpostdir/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-30  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* pmpost.ch [W32TEX]: Handle building of (u)pmpost.dll.
+
 2014-10-26  Karl Berry  <karl@tug.org>
 
 	* pmpsamp.test, upmpsamp.test: check that e[u]ptex can read
diff --git a/Build/source/texk/web2c/pmpostdir/pmpost.ch b/Build/source/texk/web2c/pmpostdir/pmpost.ch
index 01b57fc5ccf..cb4c2f117ef 100644
--- a/Build/source/texk/web2c/pmpostdir/pmpost.ch
+++ b/Build/source/texk/web2c/pmpostdir/pmpost.ch
@@ -234,6 +234,16 @@ else
 @z
 
 @x
+#define DLLPROC dllmpostmain
+@y
+#ifdef UPMP
+#define DLLPROC dllupmpostmain
+#else
+#define DLLPROC dllpmpostmain
+#endif
+@z
+
+@x
   if (dvitomp_only) {
     @<Read and set dvitomp command line options@>;
   } else {
diff --git a/Build/source/texk/web2c/texmfmp.h b/Build/source/texk/web2c/texmfmp.h
index 5f210ebbc6c..f0a244549f0 100644
--- a/Build/source/texk/web2c/texmfmp.h
+++ b/Build/source/texk/web2c/texmfmp.h
@@ -141,6 +141,8 @@ extern int runsystem (const char *cmd);
 extern void maininit (int ac, string *av);
 #if defined(WIN32) && !defined(__MINGW32__) && defined(DLLPROC)
 extern __declspec(dllexport) int DLLPROC (int ac, string *av);
+#else
+#undef DLLPROC
 #endif
 
 /* All but the Omega family use this. */