mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-04 03:50:31 +00:00
issue #5572
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7018 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -1,5 +1,7 @@
|
||||
2005-11-07 Kevin P. Fleming <kpfleming@digium.com>
|
||||
|
||||
* Makefile: correct cross-compilation issue introduced in Cygwin patches (issue #5572)
|
||||
|
||||
* apps/app_voicemail.c: upgrade to new arg/option API and implement priority jumping control (issue #5649)
|
||||
|
||||
* asterisk.c (main): setpriority() failure is not a reason to stop the process (issue #5581)
|
||||
|
13
Makefile
13
Makefile
@@ -285,12 +285,13 @@ ifeq ($(OSARCH),SunOS)
|
||||
endif
|
||||
|
||||
ifeq ($(findstring CYGWIN,$(OSARCH)),CYGWIN)
|
||||
CYGLOADER=cygwin_a
|
||||
OSARCH=CYGWIN
|
||||
ASTOBJ=-shared -o asterisk.dll -Wl,--out-implib=libasterisk.dll.a -Wl,--export-all-symbols
|
||||
ASTLINK=
|
||||
LIBS+=-lpthread -lncurses -lm -lresolv
|
||||
ASTSBINDIR=$(MODULES_DIR)
|
||||
CYGLOADER=cygwin_a
|
||||
OSARCH=CYGWIN
|
||||
ASTOBJ=-shared -o asterisk.dll -Wl,--out-implib=libasterisk.dll.a -Wl,--export-all-symbols
|
||||
ASTLINK=
|
||||
LIBS+=-lpthread -lncurses -lm -lresolv
|
||||
ASTSBINDIR=$(MODULES_DIR)
|
||||
PROC=$(shell uname -m)
|
||||
endif
|
||||
|
||||
ifndef WITHOUT_ZAPTEL
|
||||
|
@@ -36,7 +36,6 @@ WAV49 = -DWAV49
|
||||
######### which support MMX instructions. This should be newer pentiums,
|
||||
######### ppro's, etc, as well as the AMD K6 and K7. The compile will
|
||||
######### probably require gcc.
|
||||
PROC=$(shell uname -m)
|
||||
|
||||
ifneq (${OSARCH},Darwin)
|
||||
ifneq (${OSARCH},SunOS)
|
||||
|
Reference in New Issue
Block a user