diff options
| author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2003-10-27 20:00:41 +0000 |
|---|---|---|
| committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2003-10-27 20:00:41 +0000 |
| commit | 854adbe3bd6fcd137e2d78dac42c2c535bf3a945 (patch) | |
| tree | c8ce701bc8a19fff64bf153bba8347c57ac0e658 /codecs/gsm | |
| parent | 73f4bc8c25d00d2d942b3580abc779f9382ab446 (diff) | |
More cleanups and OSX fixes for 10.3
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@1678 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'codecs/gsm')
| -rwxr-xr-x | codecs/gsm/Makefile | 10 | ||||
| -rwxr-xr-x | codecs/gsm/src/code.c | 4 |
2 files changed, 11 insertions, 3 deletions
diff --git a/codecs/gsm/Makefile b/codecs/gsm/Makefile index 5e2ccd180..490f3938c 100755 --- a/codecs/gsm/Makefile +++ b/codecs/gsm/Makefile @@ -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 diff --git a/codecs/gsm/src/code.c b/codecs/gsm/src/code.c index 4d195dfbd..6358330e5 100755 --- a/codecs/gsm/src/code.c +++ b/codecs/gsm/src/code.c @@ -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); |