diff options
| author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2002-06-21 01:40:13 +0000 |
|---|---|---|
| committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2002-06-21 01:40:13 +0000 |
| commit | 87909fa28e55346e164f7c1ea3bec21aa9e1e01d (patch) | |
| tree | eb3b9515fd164afd1e2242b99a26c047f8719bfe /codecs | |
| parent | 74d376fd3728d44299a0fa2a9c15cd8012cb1b47 (diff) | |
Version 0.1.12 from FTP
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@465 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'codecs')
| -rwxr-xr-x | codecs/Makefile | 6 | ||||
| -rwxr-xr-x | codecs/lpc10/Makefile | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/codecs/Makefile b/codecs/Makefile index 027225eb8..39aa85ec1 100755 --- a/codecs/Makefile +++ b/codecs/Makefile @@ -25,6 +25,8 @@ CFLAGS+= 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) LIBMP3=mp3/libmp3.a LIBLPC10=lpc10/liblpc10.a @@ -44,7 +46,7 @@ clean: $(LIBG723): make -C g723.1 all -$(LIBGSM): +gsm/lib/libgsm.a: make -C gsm lib/libgsm.a $(LIBG723B): @@ -65,7 +67,7 @@ codec_g723_1b.o : codec_g723_1.c codec_g723_1b.so : codec_g723_1b.o $(LIBG723B) $(CC) -shared -Xlinker -x -o $@ $< $(LIBG723B) -lm -codec_gsm.so: codec_gsm.o $(LIBGSM) +codec_gsm.so: codec_gsm.o $(LIBGSMT) $(CC) -shared -Xlinker -x -o $@ $< $(LIBGSM) codec_lpc10.so: codec_lpc10.o $(LIBLPC10) diff --git a/codecs/lpc10/Makefile b/codecs/lpc10/Makefile index cce4c4d92..af5131d77 100755 --- a/codecs/lpc10/Makefile +++ b/codecs/lpc10/Makefile @@ -22,7 +22,8 @@ LIB_TARGET_DIR = . # WARNINGS = -Wall -Wno-comment -Wno-error -CFLAGS = -O6 -mpentium -I$(LIB_TARGET_DIR) $(WARNINGS) +CFLAGS = -O6 -I$(LIB_TARGET_DIR) $(WARNINGS) +CFLAGS+= $(shell if uname -m | grep -q 86; then echo "-mpentium" ; fi) LIB = $(LIB_TARGET_DIR)/liblpc10.a |