diff --git a/ChangeLog b/ChangeLog index 487f5a7d1c0a7a946e069c5015a2b1995048cf1b..a7bced1e7dd8cfdf969ff8cc0d0573c8be97560b 100755 --- a/ChangeLog +++ b/ChangeLog @@ -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) diff --git a/Makefile b/Makefile index 1f5a0bd63330cb042041ee4a5bf6e6f4b7785c5a..766fc83e1142223c20d492e1a1d716b006d8d584 100755 --- a/Makefile +++ b/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 diff --git a/codecs/gsm/Makefile b/codecs/gsm/Makefile index a2b5dcf1e6e9eb272ff27037b19c4a4b653a9907..d6eb94bb8b3516c6f608af450e9d48ab2a8997f7 100755 --- a/codecs/gsm/Makefile +++ b/codecs/gsm/Makefile @@ -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)