diff options
| author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2003-10-26 18:50:49 +0000 |
|---|---|---|
| committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2003-10-26 18:50:49 +0000 |
| commit | f9db8abd4d1bfa16f4135638c600ba0eaadec083 (patch) | |
| tree | 7d179763d95152f24ed90027acafdc363c2afcef /codecs | |
| parent | 6b2aaaa721016826b533a71fb162df76db99fecc (diff) | |
Make it build and run on MacOS X
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@1673 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'codecs')
| -rwxr-xr-x | codecs/Makefile | 16 | ||||
| -rwxr-xr-x | codecs/lpc10/Makefile | 2 | ||||
| -rwxr-xr-x | codecs/lpc10/lpc10.h | 11 | ||||
| -rwxr-xr-x | codecs/mp3/Makefile | 3 |
4 files changed, 21 insertions, 11 deletions
diff --git a/codecs/Makefile b/codecs/Makefile index 75bcced3c..a86709da8 100755 --- a/codecs/Makefile +++ b/codecs/Makefile @@ -68,31 +68,31 @@ $(LIBILBC): $(MAKE) -C ilbc all codec_ilbc.so: codec_ilbc.o $(LIBILBC) - $(CC) -shared -Xlinker -x -o $@ $< $(LIBILBC) + $(CC) $(SOLINK) -o $@ $< $(LIBILBC) codec_g723_1.so : codec_g723_1.o $(LIBG723) - $(CC) -shared -Xlinker -x -o $@ $< $(LIBG723) + $(CC) $(SOLINK) -o $@ $< $(LIBG723) codec_g723_1b.o : codec_g723_1.c $(CC) -c -o $@ $(CFLAGS) -DANNEX_B -Dsingle $< codec_g723_1b.so : codec_g723_1b.o $(LIBG723B) - $(CC) -shared -Xlinker -x -o $@ $< $(LIBG723B) -lm + $(CC) $(SOLINK) -o $@ $< $(LIBG723B) -lm codec_gsm.so: codec_gsm.o $(LIBGSMT) - $(CC) -shared -Xlinker -x -o $@ $< $(LIBGSM) + $(CC) $(SOLINK) -o $@ $< $(LIBGSM) codec_speex.so: codec_speex.o - $(CC) -shared -Xlinker -x -o $@ $< $(LIBSPEEX) + $(CC) $(SOLINK) -o $@ $< $(LIBSPEEX) codec_lpc10.so: codec_lpc10.o $(LIBLPC10) - $(CC) -shared -Xlinker -x -o $@ $< $(LIBLPC10) -lm + $(CC) $(SOLINK) -o $@ $< $(LIBLPC10) -lm codec_mp3_d.so: codec_mp3_d.o $(LIBMP3) - $(CC) -lm -shared -Xlinker -x -o $@ $< $(LIBMP3) + $(CC) -lm $(SOLINK) -o $@ $< $(LIBMP3) %.so : %.o - $(CC) -shared -Xlinker -x -o $@ $< + $(CC) $(SOLINK) -o $@ $< include .depend diff --git a/codecs/lpc10/Makefile b/codecs/lpc10/Makefile index 83ffc225b..5e04d5f73 100755 --- a/codecs/lpc10/Makefile +++ b/codecs/lpc10/Makefile @@ -26,9 +26,11 @@ CFLAGS = $(OPTIMIZE) -I$(LIB_TARGET_DIR) $(WARNINGS) -fPIC #CFLAGS+= $(shell if uname -m | grep -q 86; then echo "-mpentium" ; fi) #fix for PPC processors +ifneq ($(OSARCH),Darwin) ifneq ($(PROC),ppc) CFLAGS+= -march=$(PROC) endif +endif LIB = $(LIB_TARGET_DIR)/liblpc10.a diff --git a/codecs/lpc10/lpc10.h b/codecs/lpc10/lpc10.h index 02c59b1e4..0f751c6de 100755 --- a/codecs/lpc10/lpc10.h +++ b/codecs/lpc10/lpc10.h @@ -1,8 +1,11 @@ /* $Log$ -Revision 1.16 2003/04/23 19:13:35 markster -More OpenBSD patches +Revision 1.17 2003/10/26 18:50:49 markster +Make it build and run on MacOS X + +Revision 1.3 2003/10/26 18:50:49 markster +Make it build and run on MacOS X Revision 1.2 2003/04/23 19:13:35 markster More OpenBSD patches @@ -49,6 +52,10 @@ typedef int INT16; typedef long INT32; #endif +#if defined(__APPLE__) +typedef short INT16; +typedef int INT32; +#endif /* The initial values for every member of this structure is 0, except diff --git a/codecs/mp3/Makefile b/codecs/mp3/Makefile index f3b0c4c1a..4ee773118 100755 --- a/codecs/mp3/Makefile +++ b/codecs/mp3/Makefile @@ -1,7 +1,8 @@ # # LMC section -CFLAGS+= -I../include -Iinclude -O3 -march=$(PROC) -funroll-loops -Wall -Wno-missing-prototypes -Wno-missing-declarations -g -fPIC +CFLAGS+= -I../include -Iinclude -O3 -funroll-loops -Wall -Wno-missing-prototypes -Wno-missing-declarations -g -fPIC + RANLIB=ranlib # the XING decoder objs and dependencies: |