From: Luigi Rizzo Date: Tue, 1 Jan 2008 22:21:39 +0000 (+0000) Subject: make codec_resample build on __CYGWIN__, and make it load on FreeBSD X-Git-Tag: 1.6.0-beta1~3^2~242 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e637f2c03823576f7146aab58a49276bb55696ff;p=thirdparty%2Fasterisk.git make codec_resample build on __CYGWIN__, and make it load on FreeBSD (and probably other systems as well). Both need libresample.a to be specified in the linking phase, and cygwin needs as other BSD. The checks for OS-specific headers should really be moved to some common header though. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@95625 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/codecs/Makefile b/codecs/Makefile index a09f67149e..3fcfd88b1c 100644 --- a/codecs/Makefile +++ b/codecs/Makefile @@ -56,3 +56,4 @@ $(LIBG722): $(if $(filter codec_g722,$(EMBEDDED_MODS)),modules.link,codec_g722.so): $(LIBG722) codec_resample.o: ASTCFLAGS+=-I$(ASTTOPDIR)/main/libresample/include +codec_resample.so: LIBS += $(ASTTOPDIR)/main/libresample/libresample.a diff --git a/codecs/codec_resample.c b/codecs/codec_resample.c index ce0d60a515..66d60169d9 100644 --- a/codecs/codec_resample.c +++ b/codecs/codec_resample.c @@ -29,7 +29,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") /* These are for SHRT_MAX and FLT_MAX -- { */ -#if defined(__Darwin__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__) +#if defined(__Darwin__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__CYGWIN__) #include #else #include