diff options
author | rizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-01-01 22:21:39 +0000 |
---|---|---|
committer | rizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-01-01 22:21:39 +0000 |
commit | 5503f69d4cd1fdea1cc66713c0783569dfafb69f (patch) | |
tree | 66e808c84e679c937cea66e7d01ab75fb1f51fb4 /codecs | |
parent | 206811e88179dd77f49c8faa7b8bb7ca76d89e45 (diff) |
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 <float.h> as other BSD.
The checks for OS-specific headers should really be moved to some
common header though.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@95625 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'codecs')
-rw-r--r-- | codecs/Makefile | 1 | ||||
-rw-r--r-- | codecs/codec_resample.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/codecs/Makefile b/codecs/Makefile index a09f67149..3fcfd88b1 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 ce0d60a51..66d60169d 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 <float.h> #else #include <values.h> |