Browse Source

Dynamically link with pthreads-w32

Adds some explanation what would need to be done to link pthreads statically
v0.7.4-release
Bert Belder 14 years ago
parent
commit
62af617f84
  1. 8
      deps/libeio/eio.c
  2. 7
      wscript

8
deps/libeio/eio.c

@ -42,9 +42,11 @@
#ifdef EIO_STACKSIZE #ifdef EIO_STACKSIZE
# define XTHREAD_STACKSIZE EIO_STACKSIZE # define XTHREAD_STACKSIZE EIO_STACKSIZE
#endif #endif
#ifdef _WIN32
# define PTW32_STATIC_LIB 1 // For statically-linked pthreads-w32, use:
#endif // #ifdef _WIN32
// # define PTW32_STATIC_LIB 1
// #endif
#include "xthread.h" #include "xthread.h"
#include <errno.h> #include <errno.h>

7
wscript

@ -396,6 +396,13 @@ def configure(conf):
# Split off debug variant before adding variant specific defines # Split off debug variant before adding variant specific defines
debug_env = conf.env.copy() debug_env = conf.env.copy()
conf.set_env_name('debug', debug_env) 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 # Configure debug variant
conf.setenv('debug') conf.setenv('debug')

Loading…
Cancel
Save