diff options
| author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-06-13 21:25:10 +0000 |
|---|---|---|
| committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-06-13 21:25:10 +0000 |
| commit | 1e1095862dbfb7b0806ef2a31b1a914548b52ceb (patch) | |
| tree | bd4a3ebe7ebaab440e8bfb5016e2cd306e403300 /codecs | |
| parent | e160148695c99ec2d4ea29f53c8d067a6c2f89fe (diff) | |
x86-64 compile fixes and cleanups
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@3202 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'codecs')
| -rwxr-xr-x | codecs/gsm/Makefile | 4 | ||||
| -rwxr-xr-x | codecs/ilbc/Makefile | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/codecs/gsm/Makefile b/codecs/gsm/Makefile index effdbcbac..1cfa939e1 100755 --- a/codecs/gsm/Makefile +++ b/codecs/gsm/Makefile @@ -200,7 +200,7 @@ GSM_SOURCES = $(SRC)/add.c \ $(SRC)/short_term.c \ $(SRC)/table.c ifeq (${OSARCH},Linux) -ifneq (${PROC},x86_64) +ifneq ($(shell uname -m),x86_64) ifneq ($(shell uname -m),ppc) ifneq ($(shell uname -m),alpha) GSM_SOURCES+= $(SRC)/k6opt.s @@ -253,7 +253,7 @@ GSM_OBJECTS = $(SRC)/add.o \ $(SRC)/short_term.o \ $(SRC)/table.o ifeq (${OSARCH},Linux) -ifneq (${PROC},x86_64) +ifneq ($(shell uname -m), x86_64) ifneq ($(shell uname -m), ppc) ifneq ($(shell uname -m), alpha) GSM_OBJECTS+= $(SRC)/k6opt.o diff --git a/codecs/ilbc/Makefile b/codecs/ilbc/Makefile index dd2bbc3f2..12471d105 100755 --- a/codecs/ilbc/Makefile +++ b/codecs/ilbc/Makefile @@ -1,4 +1,5 @@ -CFLAGS+=-Wall -Werror -fPIC -O3 -march=$(shell uname -m) -funroll-loops -fomit-frame-pointer +ARCH=$(PROC) +CFLAGS+=-Wall -Werror -fPIC -O3 -march=$(ARCH) -funroll-loops -fomit-frame-pointer LIB=libilbc.a OBJS= anaFilter.o iCBSearch.o packing.o \ |