summaryrefslogtreecommitdiff
path: root/Build/source/texk/gsftopk
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2014-06-23 12:34:24 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2014-06-23 12:34:24 +0000
commitb14e0811b868de26513fce4285f834ab3a2022fc (patch)
treede947d2353675dc01a6c2662b69b015a7eb866a8 /Build/source/texk/gsftopk
parentbf1798dc9c4acbc4b268be16bd9189e300e22842 (diff)
support gsdll32.dll and gsdll64.dll in gsftopk (Windows only)
git-svn-id: svn://tug.org/texlive/trunk@34356 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/gsftopk')
-rw-r--r--Build/source/texk/gsftopk/ChangeLog4
-rw-r--r--Build/source/texk/gsftopk/gsftopk.c12
2 files changed, 13 insertions, 3 deletions
diff --git a/Build/source/texk/gsftopk/ChangeLog b/Build/source/texk/gsftopk/ChangeLog
index a016de7d7e4..8a386627aca 100644
--- a/Build/source/texk/gsftopk/ChangeLog
+++ b/Build/source/texk/gsftopk/ChangeLog
@@ -1,3 +1,7 @@
+2014-06-23 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
+
+ * gsftopk.c: Support 64bit compilation (Windows only).
+
2014-06-19 Peter Breitenlohner <peb@mppmu.mpg.de>
* gsftopk.c: Avoid undefined behaviour when char is signed.
diff --git a/Build/source/texk/gsftopk/gsftopk.c b/Build/source/texk/gsftopk/gsftopk.c
index fd6f2d5243a..b1b827f0fed 100644
--- a/Build/source/texk/gsftopk/gsftopk.c
+++ b/Build/source/texk/gsftopk/gsftopk.c
@@ -259,11 +259,17 @@ static void Win32Error(const char *s)
exit(EXIT_FAILURE);
}
+#ifdef _WIN64
+#define GSDLLNAME "gsdll64.dll"
+#else
+#define GSDLLNAME "gsdll32.dll"
+#endif
+
static HINSTANCE gs_locate(void)
{
- hgsdll = GetModuleHandle("GSDLL32.DLL");
+ hgsdll = GetModuleHandle(GSDLLNAME);
if(hgsdll == NULL) {
- hgsdll = LoadLibrary("GSDLL32.DLL");
+ hgsdll = LoadLibrary(GSDLLNAME);
}
return hgsdll;
}
@@ -292,7 +298,7 @@ HANDLE hGsThread = NULL;
HANDLE hGsDataIn = 0, hGsDataOut = 0; /* Events to synchronize threads */
/* Arguments to gs dll */
const
-char *gs_argv[] = { "gswin32c.exe", /* 0, */
+char *gs_argv[] = { "rungs.exe", /* 0, dummy */
"-dNOGC", /* 1, */
"-dNODISPLAY", /* 2, */
NULL, /* 3, substarg */