kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

slim build to just lib and fix some build errors and autotools errors 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@11981 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2009-02-13 06:54:26 +00:00
parent 0a46124fbe
commit 39efeabec3
4 changed files with 31 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/speex/Makefile.am
View File

@ -13,7 +13,7 @@ pkgconfig_DATA = speex.pc speexdsp.pc
EXTRA_DIST = Speex.spec Speex.spec.in Speex.kdevelop speex.m4 speex.pc.in README.blackfin README.symbian README.TI-DSP
#Fools KDevelop into including all files
SUBDIRS = libspeex include @src@ doc win32 symbian ti
SUBDIRS = libspeex include
DIST_SUBDIRS = libspeex include src doc win32 symbian ti

41
libs/speex/configure.ac
View File

@ -208,33 +208,18 @@ kiss (default fixed point), smallft (default floating point), gpl-fftw3 and prop
)
FFT_PKGCONFIG=
AS_CASE([$FFT],
[kiss], [
AC_DEFINE([USE_KISS_FFT], [], [Use KISS Fast Fourier Transform])
],
[smallft], [
AC_DEFINE([USE_SMALLFT], [], [Use FFT from OggVorbis])
],
[gpl-fftw3], [
AC_DEFINE([USE_GPL_FFTW3], [], [Use FFTW3 for FFT])
PKG_CHECK_MODULES(FFT, fftw3f)
],
[proprietary-intel-mkl], [
AC_DEFINE([USE_INTEL_MKL], [], [Use Intel Math Kernel Library for FFT])
AC_MSG_CHECKING(for valid MKL)
AC_LINK_IFELSE([
AC_LANG_PROGRAM([[
#include <mkl.h>
void func() {
DFTI_DESCRIPTOR_HANDLE h;
MKL_LONG result=DftiCreateDescriptor(&h, DFTI_SINGLE, DFTI_REAL, 0);
}]])],
[AC_MSG_RESULT(yes)],
[AC_MSG_FAILURE([Failed to compile MKL test program. Make sure you set CFLAGS to include the include directory and set LDFLAGS to include the library directory and all necesarry libraries.])]
)
],
[AC_MSG_FAILURE([Unknown FFT $FFT specified for --with-fft])]
)
case $FFT in
kiss)
AC_DEFINE([USE_KISS_FFT], [], [Use KISS Fast Fourier Transform]) ;;
smallft)
AC_DEFINE([USE_SMALLFT], [], [Use FFT from OggVorbis]) ;;
*)
AC_MSG_FAILURE([Unknown FFT $FFT specified for --with-fft]) ;;
esac
AC_SUBST(FFT_LIBS)
AC_SUBST(FFT_CFLAGS)
AM_CONDITIONAL(BUILD_KISS_FFT, [test "$FFT" = "kiss"])
AM_CONDITIONAL(BUILD_SMALLFT, [test "$FFT" = "smallft"])
AC_SUBST(FFT_PKGCONFIG)
@ -273,7 +258,7 @@ fi
AC_SUBST(SIZE16)
AC_SUBST(SIZE32)
AC_OUTPUT([Makefile libspeex/Makefile src/Makefile doc/Makefile Speex.spec
AC_OUTPUT([Makefile libspeex/Makefile src/Makefile Speex.spec
include/Makefile include/speex/Makefile speex.pc speexdsp.pc
win32/Makefile win32/libspeex/Makefile win32/speexenc/Makefile
win32/speexdec/Makefile symbian/Makefile

26
libs/speex/libspeex/Makefile.am
View File

@ -40,16 +40,16 @@ noinst_HEADERS = arch.h cb_search_arm4.h cb_search_bfin.h cb_search_sse.h \
libspeex_la_LDFLAGS = -no-undefined -version-info @SPEEX_LT_CURRENT@:@SPEEX_LT_REVISION@:@SPEEX_LT_AGE@
libspeexdsp_la_LDFLAGS = -no-undefined -version-info @SPEEX_LT_CURRENT@:@SPEEX_LT_REVISION@:@SPEEX_LT_AGE@
noinst_PROGRAMS = testenc testenc_wb testenc_uwb testdenoise testecho testjitter
testenc_SOURCES = testenc.c
testenc_LDADD = libspeex.la
testenc_wb_SOURCES = testenc_wb.c
testenc_wb_LDADD = libspeex.la
testenc_uwb_SOURCES = testenc_uwb.c
testenc_uwb_LDADD = libspeex.la
testdenoise_SOURCES = testdenoise.c
testdenoise_LDADD = libspeexdsp.la @FFT_LIBS@
testecho_SOURCES = testecho.c
testecho_LDADD = libspeexdsp.la @FFT_LIBS@
testjitter_SOURCES = testjitter.c
testjitter_LDADD = libspeexdsp.la @FFT_LIBS@
#noinst_PROGRAMS = testenc testenc_uwb testdenoise testecho testjitter testenc_wb
#testenc_SOURCES = testenc.c
#testenc_LDADD = libspeex.la
#testenc_wb_SOURCES = testenc_wb.c
#testenc_wb_LDADD = libspeex.la
#testenc_uwb_SOURCES = testenc_uwb.c
#testenc_uwb_LDADD = libspeex.la
#testdenoise_SOURCES = testdenoise.c
#testdenoise_LDADD = libspeexdsp.la @FFT_LIBS@
#testecho_SOURCES = testecho.c
#testecho_LDADD = libspeexdsp.la @FFT_LIBS@
#testjitter_SOURCES = testjitter.c
#testjitter_LDADD = libspeexdsp.la @FFT_LIBS@

6
libs/speex/libspeex/math_approx.c
View File

@ -136,6 +136,7 @@ spx_word16_t spx_acos(spx_word16_t x)
#define K3 340
#define K4 -10
#if 0
spx_word16_t spx_cos(spx_word16_t x)
{
spx_word16_t x2;
@ -150,7 +151,7 @@ spx_word16_t spx_cos(spx_word16_t x)
return SUB32(-K1, MULT16_16_P13(x2, ADD32(K2, MULT16_16_P13(x2, ADD32(K3, MULT16_16_P13(K4, x2))))));
}
}
#endif
#else
#ifndef M_PI
@ -164,6 +165,7 @@ spx_word16_t spx_cos(spx_word16_t x)
#define SPX_PI_2 1.5707963268
#if 0
spx_word16_t spx_cos(spx_word16_t x)
{
if (x<SPX_PI_2)
@ -177,5 +179,5 @@ spx_word16_t spx_cos(spx_word16_t x)
}
}
#endif
#endif