diff options
Diffstat (limited to 'codecs')
-rwxr-xr-x | codecs/Makefile | 10 | ||||
-rwxr-xr-x | codecs/gsm/Makefile | 4 | ||||
-rwxr-xr-x | codecs/lpc10/Makefile | 4 |
3 files changed, 12 insertions, 6 deletions
diff --git a/codecs/Makefile b/codecs/Makefile index 31c67dfc2..a5a3f722c 100755 --- a/codecs/Makefile +++ b/codecs/Makefile @@ -19,19 +19,19 @@ #MODG723=codec_g723_1.so codec_g723_1b.so MODG723=$(shell [ -f g723.1/coder.c ] && echo "codec_g723_1.so") MODG723+=$(shell [ -f g723.1b/coder2.c ] && echo "codec_g723_1b.so") -MODSPEEX=$(shell [ -f /usr/include/speex.h ] || [ -f /usr/include/speex/speex.h ] || [ -f /usr/local/include/speex.h ] || [ -f /usr/local/include/speex/speex.h ] && echo "codec_speex.so") +MODSPEEX=$(shell [ -f $(CROSS_COMPILE_TARGET)/usr/include/speex.h ] || [ -f $(CROSS_COMPILE_TARGET)/usr/include/speex/speex.h ] || [ -f $(CROSS_COMPILE_TARGET)/usr/local/include/speex.h ] || [ -f $(CROSS_COMPILE_TARGET)/usr/local/include/speex/speex.h ] && echo "codec_speex.so") MODILBC=$(shell [ -f ilbc/iLBC_decode.h ] && echo "codec_ilbc.so") CFLAGS+=-fPIC -CFLAGS+=$(shell [ -f /usr/local/include/speex.h ] && echo "-I/usr/local/include") -CFLAGS+=$(shell [ -f /usr/local/include/speex/speex.h ] && echo "-I/usr/local/include/speex") -CFLAGS+=$(shell [ -f /usr/include/speex/speex.h ] && echo "-I/usr/include/speex") +CFLAGS+=$(shell [ -f $(CROSS_COMPILE_TARGET)/usr/local/include/speex.h ] && echo "-I$(CROSS_COMPILE_TARGET)/usr/local/include") +CFLAGS+=$(shell [ -f $(CROSS_COMPILE_TARGET)/usr/local/include/speex/speex.h ] && echo "-I$(CROSS_COMPILE_TARGET)/usr/local/include/speex") +CFLAGS+=$(shell [ -f $(CROSS_COMPILE_TARGET)/usr/include/speex/speex.h ] && echo "-I$(CROSS_COMPILE_TARGET)/usr/include/speex") LIBG723=g723.1/libg723.a LIBG723B=g723.1b/libg723b.a LIBGSM=gsm/lib/libgsm.a LIBGSMT=gsm/lib/libgsm.a LIBLPC10=lpc10/liblpc10.a -LIBSPEEX=$(shell [ -f /usr/local/lib/libspeex.a ] && echo "-L/usr/local/lib") +LIBSPEEX=$(shell [ -f $(CROSS_COMPILE_TARGET)/usr/local/lib/libspeex.a ] && echo "-L$(CROSS_COMPILE_TARGET)/usr/local/lib") LIBSPEEX+=-lspeex -lm LIBILBC=ilbc/libilbc.a diff --git a/codecs/gsm/Makefile b/codecs/gsm/Makefile index 5aeb11b84..fc9fa6b27 100755 --- a/codecs/gsm/Makefile +++ b/codecs/gsm/Makefile @@ -45,6 +45,7 @@ ifneq ($(shell uname -m),ppc) ifneq ($(shell uname -m),ppc64) ifneq ($(shell uname -m),alpha) ifneq (${PROC},sparc64) +ifneq (${PROC},arm) OPTIMIZE+=-march=$(PROC) endif endif @@ -54,6 +55,7 @@ endif endif endif endif +endif #The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only. #This works for even old (2.96) versions of gcc and provides a small boost either way. @@ -222,6 +224,7 @@ ifneq ($(shell uname -m),ppc) ifneq ($(shell uname -m),ppc64) ifneq ($(shell uname -m),alpha) ifneq ($(shell uname -m),sparc64) +ifneq (${PROC},arm) GSM_SOURCES+= $(SRC)/k6opt.s endif endif @@ -229,6 +232,7 @@ endif endif endif endif +endif TOAST_SOURCES = $(SRC)/toast.c \ $(SRC)/toast_lin.c \ diff --git a/codecs/lpc10/Makefile b/codecs/lpc10/Makefile index 0a2e03008..01f7a7b81 100755 --- a/codecs/lpc10/Makefile +++ b/codecs/lpc10/Makefile @@ -40,7 +40,9 @@ ifeq ($(PROC),ultrasparc) CFLAGS+= -mtune=$(PROC) -mcpu=v8 -O3 -fomit-frame-pointer else ifneq ($(OSARCH),SunOS) - CFLAGS+= -march=$(PROC) +ifneq ($(OSARCH),arm) +# CFLAGS+= -march=$(PROC) +endif endif endif endif |