summaryrefslogtreecommitdiff
path: root/Build/source
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2014-11-19 11:52:43 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2014-11-19 11:52:43 +0000
commitadcfa7bacbbde29b656f796d71629faba31d6c8c (patch)
tree9b9b0b42095a107a218a0cd558f85ba5f2105e78 /Build/source
parent03282d8528ff06458868dee6d8a284e2998ebad1 (diff)
texk/dvipdfm-x: Modified support to make DLL(s) in W32TeX
git-svn-id: svn://tug.org/texlive/trunk@35620 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source')
-rw-r--r--Build/source/texk/dvipdfm-x/ChangeLog4
-rw-r--r--Build/source/texk/dvipdfm-x/dvipdfmx.c7
-rw-r--r--Build/source/texk/texlive/ChangeLog5
3 files changed, 15 insertions, 1 deletions
diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog
index b4382b93869..57ffd036c1a 100644
--- a/Build/source/texk/dvipdfm-x/ChangeLog
+++ b/Build/source/texk/dvipdfm-x/ChangeLog
@@ -1,3 +1,7 @@
+2014-11-19 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * dvipdfmx.c: Modified support to make DLL(s) in W32TeX.
+
2014-11-15 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
* dvipdfmx.c: Support to make DLL in W32TeX.
diff --git a/Build/source/texk/dvipdfm-x/dvipdfmx.c b/Build/source/texk/dvipdfm-x/dvipdfmx.c
index a4767609de7..c12f2681d1d 100644
--- a/Build/source/texk/dvipdfm-x/dvipdfmx.c
+++ b/Build/source/texk/dvipdfm-x/dvipdfmx.c
@@ -884,9 +884,14 @@ do_mps_pages (void)
}
}
+#if defined(XETEX)
+/* At present no DLL for xdvipdfmx */
+#undef DLLPROC
+#else
/* Support to make DLL in W32TeX */
#define DLLPROC dlldvipdfmxmain
-#if defined(WIN32) && !defined(XETEX) && !defined(__MINGW32__) && !defined(MIKTEX)
+#endif
+#if defined(WIN32) && !defined(__MINGW32__) && !defined(MIKTEX)
extern __declspec(dllexport) int DLLPROC (int argc, char *argv[]);
#else
#undef DLLPROC
diff --git a/Build/source/texk/texlive/ChangeLog b/Build/source/texk/texlive/ChangeLog
index 9109c82fb95..5f9639ef4bf 100644
--- a/Build/source/texk/texlive/ChangeLog
+++ b/Build/source/texk/texlive/ChangeLog
@@ -1,3 +1,8 @@
+2014-11-18 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * w64_wrapper/runscript.{dll,exe}: Now compiled with Mingw64 to
+ make them independent from msvcr100.dll.
+
2014-11-17 Peter Breitenlohner <peb@mppmu.mpg.de>
* w64_wrapper: Directory with WIN64 executables.