Dynamically link with pthreads-w32

Adds some explanation what would need to be done to link pthreads statically

diff --git a/deps/libeio/eio.c b/deps/libeio/eio.c
index ce0ff39..27f94ad 100644 (file)
--- a/deps/libeio/eio.c
+++ b/deps/libeio/eio.c
@@ -42,9 +42,11 @@
 #ifdef EIO_STACKSIZE
 # define XTHREAD_STACKSIZE EIO_STACKSIZE
 #endif
-#ifdef _WIN32
-# define PTW32_STATIC_LIB 1
-#endif
+
+// For statically-linked pthreads-w32, use:
+// #ifdef _WIN32
+// # define PTW32_STATIC_LIB 1
+// #endif
 #include "xthread.h"
 
 #include <errno.h>

diff --git a/wscript b/wscript
index ebf6a1b..45722d6 100644 (file)
--- a/wscript
+++ b/wscript
@@ -396,6 +396,13 @@ def configure(conf):
   # Split off debug variant before adding variant specific defines
   debug_env = conf.env.copy()
   conf.set_env_name('debug', debug_env)
+  
+  if (sys.platform.startswith("win32")):
+    # Static pthread - crashes
+    #conf.env.append_value('LINKFLAGS', '../deps/pthreads-w32/libpthreadGC2.a')
+    #debug_env.append_value('LINKFLAGS', '../deps/pthreads-w32/libpthreadGC2d.a')
+    # Pthread dll
+    conf.env.append_value('LIB', 'pthread.dll')
 
   # Configure debug variant
   conf.setenv('debug')