|
|
|
@ -1,15 +1,16 @@
|
|
|
|
|
This file is part of MXE.
|
|
|
|
|
See index.html for further information.
|
|
|
|
|
|
|
|
|
|
Commits backported (cherry-picked) from upstream.
|
|
|
|
|
From 9348978f78c6feae6e9bab4499ab035c6e5e25ea Mon Sep 17 00:00:00 2001
|
|
|
|
|
From e951f784c852f4cd8298864190936fded1efceba Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Mark Brand <mabrand@mabrand.nl>
|
|
|
|
|
Date: Sun, 27 May 2012 22:00:19 +0200
|
|
|
|
|
Subject: [PATCH] force static for convenience
|
|
|
|
|
|
|
|
|
|
---
|
|
|
|
|
pthread.h | 4 ++++
|
|
|
|
|
1 file changed, 4 insertions(+)
|
|
|
|
|
pthread.h | 4 ++++
|
|
|
|
|
sched.h | 4 ++++
|
|
|
|
|
semaphore.h | 4 ++++
|
|
|
|
|
3 files changed, 12 insertions(+)
|
|
|
|
|
|
|
|
|
|
diff --git a/pthread.h b/pthread.h
|
|
|
|
|
index b4072f7..c88c886 100755
|
|
|
|
@ -22,6 +23,36 @@ index b4072f7..c88c886 100755
|
|
|
|
|
+
|
|
|
|
|
+// MXE: Set this for convenience here since MXE only does static.
|
|
|
|
|
+#define PTW32_STATIC_LIB
|
|
|
|
|
+
|
|
|
|
|
#if !defined(PTW32_STATIC_LIB)
|
|
|
|
|
# if defined(PTW32_BUILD)
|
|
|
|
|
# define PTW32_DLLPORT __declspec (dllexport)
|
|
|
|
|
diff --git a/sched.h b/sched.h
|
|
|
|
|
index f36a97a..1f4f401 100755
|
|
|
|
|
--- a/sched.h
|
|
|
|
|
+++ b/sched.h
|
|
|
|
|
@@ -76,6 +76,10 @@
|
|
|
|
|
* do NOT define PTW32_BUILD, and then the variables/functions will
|
|
|
|
|
* be imported correctly.
|
|
|
|
|
*/
|
|
|
|
|
+
|
|
|
|
|
+// MXE: Set this for convenience here since MXE only does static.
|
|
|
|
|
+#define PTW32_STATIC_LIB
|
|
|
|
|
+
|
|
|
|
|
#if !defined(PTW32_STATIC_LIB)
|
|
|
|
|
# if defined(PTW32_BUILD)
|
|
|
|
|
# define PTW32_DLLPORT __declspec (dllexport)
|
|
|
|
|
diff --git a/semaphore.h b/semaphore.h
|
|
|
|
|
index c6e9407..2b64173 100755
|
|
|
|
|
--- a/semaphore.h
|
|
|
|
|
+++ b/semaphore.h
|
|
|
|
|
@@ -75,6 +75,10 @@
|
|
|
|
|
* do NOT define PTW32_BUILD, and then the variables/functions will
|
|
|
|
|
* be imported correctly.
|
|
|
|
|
*/
|
|
|
|
|
+
|
|
|
|
|
+// MXE: Set this for convenience here since MXE only does static.
|
|
|
|
|
+#define PTW32_STATIC_LIB
|
|
|
|
|
+
|
|
|
|
|
#if !defined(PTW32_STATIC_LIB)
|
|
|
|
|
# if defined(PTW32_BUILD)
|
|
|
|
|