diff options
author | rizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-11-17 10:54:52 +0000 |
---|---|---|
committer | rizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-11-17 10:54:52 +0000 |
commit | 163cc146a71beb14c24a62e171978118d3a7023c (patch) | |
tree | 5a1238373259b4826d15db062401668a35c38bf3 | |
parent | 678373f7a80925b4dc21a0f24419c5c973e2958f (diff) |
more cygwin/mingw32 compatibility fixes
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@89373 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | main/Makefile | 4 | ||||
-rw-r--r-- | utils/Makefile | 8 | ||||
-rw-r--r-- | utils/extconf.c | 2 |
3 files changed, 13 insertions, 1 deletions
diff --git a/main/Makefile b/main/Makefile index a5e278b8f..d118d3adf 100644 --- a/main/Makefile +++ b/main/Makefile @@ -85,6 +85,10 @@ ifeq ($(OSARCH),FreeBSD) AST_LIBS+=-lcrypto endif +ifneq ($(findstring $(OSARCH), mingw32 cygwin ),) + AST_LIBS+=-lminires -ldl + ASTLINK+= -shared -Wl,--out-implib,asterisk.dll +endif ifeq ($(OSARCH),NetBSD) AST_LIBS+=-lpthread -lcrypto -lm -L/usr/pkg/lib $(EDITLINE_LIB) endif diff --git a/utils/Makefile b/utils/Makefile index 2edb26a20..95fcee186 100644 --- a/utils/Makefile +++ b/utils/Makefile @@ -30,6 +30,14 @@ ifeq ($(OSARCH),OpenBSD) UTILS:=$(filter-out muted,$(UTILS)) endif +ifeq ($(OSARCH),cygwin) + UTILS:=$(filter-out muted,$(UTILS)) +endif + +ifeq ($(OSARCH),mingw32) + UTILS:= +endif + ifneq ($(findstring darwin,$(OSARCH)),) AUDIO_LIBS=-framework CoreAudio endif diff --git a/utils/extconf.c b/utils/extconf.c index 0028e82ae..0e4071833 100644 --- a/utils/extconf.c +++ b/utils/extconf.c @@ -1146,7 +1146,7 @@ extern int ast_language_is_prefix; /* Asterisk REQUIRES recursive (not error checking) mutexes and will not run without them. */ -#if defined(PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP) +#if defined(PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP) && defined(PTHREAD_MUTEX_RECURSIVE_NP) #define PTHREAD_MUTEX_INIT_VALUE PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP #define AST_MUTEX_KIND PTHREAD_MUTEX_RECURSIVE_NP #else |