More cleanups and OSX fixes for 10.3

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1678 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2003-10-27 20:00:41 +00:00
parent 251e70953e
commit 0de223a1ee
12 changed files with 48 additions and 65 deletions

View File

@@ -27,8 +27,7 @@ CFLAGS+=$(shell [ -f /usr/local/include/speex.h ] && echo "-I/usr/local/include"
LIBG723=g723.1/libg723.a
LIBG723B=g723.1b/libg723b.a
LIBGSM=gsm/lib/libgsm.a
LIBGSM=$(shell if uname -m | grep -q 86; then echo gsm/lib/libgsm.a; else echo "-lgsm" ; fi)
LIBGSMT=$(shell if uname -m | grep -q 86; then echo gsm/lib/libgsm.a; fi)
LIBGSMT=gsm/lib/libgsm.a
LIBMP3=mp3/libmp3.a
LIBLPC10=lpc10/liblpc10.a
LIBSPEEX=$(shell [ -f /usr/local/lib/libspeex.a ] && echo "-L/usr/local/lib")

View File

@@ -37,6 +37,10 @@ WAV49 = -DWAV49
######### ppro's, etc, as well as the AMD K6 and K7. The compile will
######### probably require gcc.
ifneq (${OSARCH},Darwin)
OPTIMIZE+=-march=$(PROC)
endif
PG =
#PG = -g -pg
######### Profiling flags. If you don't know what that means, leave it blank.
@@ -54,7 +58,7 @@ PG =
# CC = /usr/lang/acc
# CCFLAGS = -c -O
CC = gcc $(OPTIMIZE) -march=$(PROC) -fomit-frame-pointer
CC = gcc $(OPTIMIZE) -fomit-frame-pointer
CCFLAGS += -c -DNeedFunctionPrototypes=1 -funroll-loops -fPIC
LD = $(CC)
@@ -189,7 +193,7 @@ GSM_SOURCES = $(SRC)/add.c \
$(SRC)/gsm_option.c \
$(SRC)/short_term.c \
$(SRC)/table.c
ifneq (${OSARCH},OpenBSD)
ifeq (${OSARCH},Linux)
GSM_SOURCES+= $(SRC)/k6opt.s
endif
@@ -236,7 +240,7 @@ GSM_OBJECTS = $(SRC)/add.o \
$(SRC)/gsm_option.o \
$(SRC)/short_term.o \
$(SRC)/table.o
ifneq (${OSARCH},OpenBSD)
ifeq (${OSARCH},Linux)
GSM_OBJECTS+= $(SRC)/k6opt.o
endif

View File

@@ -62,6 +62,10 @@ void Gsm_Coder P8((S,s,LARc,Nc,bc,Mc,xmaxc,xMc),
word so[160];
#if !(defined(__GNUC__) && defined(__i386__))
longword ltmp;
#endif
Gsm_Preprocess (S, s, so);
Gsm_LPC_Analysis (S, so, LARc);
Gsm_Short_Term_Analysis_Filter (S, LARc, so);

View File

@@ -37,42 +37,17 @@ LIB = $(LIB_TARGET_DIR)/liblpc10.a
.PHONY: all clean
all: $(LIB)
ranlib $(LIB)
$(LIB): $(LIB)(f2clib.o) \
$(LIB)(analys.o) \
$(LIB)(bsynz.o) \
$(LIB)(chanwr.o) \
$(LIB)(dcbias.o) \
$(LIB)(decode.o) \
$(LIB)(deemp.o) \
$(LIB)(difmag.o) \
$(LIB)(dyptrk.o) \
$(LIB)(encode.o) \
$(LIB)(energy.o) \
$(LIB)(ham84.o) \
$(LIB)(hp100.o) \
$(LIB)(invert.o) \
$(LIB)(irc2pc.o) \
$(LIB)(ivfilt.o) \
$(LIB)(lpcdec.o) \
$(LIB)(lpcenc.o) \
$(LIB)(lpcini.o) \
$(LIB)(lpfilt.o) \
$(LIB)(median.o) \
$(LIB)(mload.o) \
$(LIB)(onset.o) \
$(LIB)(pitsyn.o) \
$(LIB)(placea.o) \
$(LIB)(placev.o) \
$(LIB)(preemp.o) \
$(LIB)(prepro.o) \
$(LIB)(random.o) \
$(LIB)(rcchk.o) \
$(LIB)(synths.o) \
$(LIB)(tbdm.o) \
$(LIB)(voicin.o) \
$(LIB)(vparms.o)
OBJ= f2clib.o analys.o bsynz.o chanwr.o dcbias.o decode.o \
deemp.o difmag.o dyptrk.o encode.o energy.o ham84.o \
hp100.o invert.o irc2pc.o ivfilt.o lpcdec.o lpcenc.o \
lpcini.o lpfilt.o median.o mload.o onset.o pitsyn.o \
placea.o placev.o preemp.o prepro.o random.o rcchk.o \
synths.o tbdm.o voicin.o vparms.o
$(LIB): $(OBJ)
$(AR) cr $@ $(OBJ)
ranlib $@
clean:
-rm -f *.o $(LIB)