summaryrefslogtreecommitdiff
path: root/Build/source/libs/teckit/TLpatches/patch-05-static
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-02-13 22:32:47 +0000
committerKarl Berry <karl@freefriends.org>2017-02-13 22:32:47 +0000
commit370b138f85fb5eee6e176bcd9ad772ba178cb843 (patch)
tree8a61482b1002160dab258c9dc051c14abd2ab46d /Build/source/libs/teckit/TLpatches/patch-05-static
parent11e8da1007c229802798bcb15cc69c62f5b8e5f6 (diff)
TLpatches seems nicer than all uppercase; sorry for churn
git-svn-id: svn://tug.org/texlive/trunk@43214 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/teckit/TLpatches/patch-05-static')
-rw-r--r--Build/source/libs/teckit/TLpatches/patch-05-static44
1 files changed, 44 insertions, 0 deletions
diff --git a/Build/source/libs/teckit/TLpatches/patch-05-static b/Build/source/libs/teckit/TLpatches/patch-05-static
new file mode 100644
index 00000000000..00d0d2eccc2
--- /dev/null
+++ b/Build/source/libs/teckit/TLpatches/patch-05-static
@@ -0,0 +1,44 @@
+ For TeX Live we build a static library and not a Dll.
+
+diff -ur teckit-2.5.6.orig/source/Engine.cpp teckit-2.5.6/source/Engine.cpp
+--- teckit-2.5.6.orig/source/Engine.cpp Tue May 31 05:37:08 2016
++++ teckit-2.5.6/source/Engine.cpp Fri Dec 30 18:18:57 2016
+@@ -51,12 +51,6 @@
+ # define NOSERVICE
+ # define NOMCX
+ # include <windows.h>
+-
+- BOOL WINAPI
+- DllMain(HINSTANCE /*hInst*/, DWORD /*wDataSeg*/, LPVOID /*lpReserved*/)
+- {
+- return true;
+- }
+ #endif
+
+ #include "Engine.h"
+diff -ur teckit-2.5.6.orig/source/Public-headers/TECkit_Compiler.h teckit-2.5.6/source/Public-headers/TECkit_Compiler.h
+--- teckit-2.5.6.orig/source/Public-headers/TECkit_Compiler.h Tue May 31 05:37:08 2016
++++ teckit-2.5.6/source/Public-headers/TECkit_Compiler.h Fri Dec 30 18:21:02 2016
+@@ -30,6 +30,9 @@
+ #ifdef _WIN32
+ /* MS compiler has predefined _WIN32, so assume Windows target */
+ #include <windows.h> // apparently just using windef.h fails on VC++6
++#undef WINAPI
++#define WINAPI
++#define EXPORTED
+ #else
+ /* not the MS compiler, so try Metrowerks' platform macros */
+ #ifndef __APPLE__
+diff -ur teckit-2.5.6.orig/source/Public-headers/TECkit_Engine.h teckit-2.5.6/source/Public-headers/TECkit_Engine.h
+--- teckit-2.5.6.orig/source/Public-headers/TECkit_Engine.h Tue May 31 05:37:08 2016
++++ teckit-2.5.6/source/Public-headers/TECkit_Engine.h Fri Dec 30 18:22:04 2016
+@@ -80,6 +80,9 @@
+ #ifdef _WIN32
+ /* MS compiler has predefined _WIN32, so assume Windows target */
+ #include <windows.h>
++#undef WINAPI
++#define WINAPI
++#define EXPORTED
+ #else
+ /* not the MS compiler, so try Metrowerks' platform macros */
+ #ifndef __APPLE__