diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-11-01 21:53:30 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-11-01 21:53:30 +0000 |
| commit | 4d4023555b8c4e5812d2ac67242fe7754acc6def (patch) | |
| tree | 17036a33b500972a312f1a5b2c75bee313f4b4d1 /codecs | |
| parent | a68250b79bf5358b7cf67bbd9185409a17993abc (diff) | |
issue #4678
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@6936 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'codecs')
| -rwxr-xr-x | codecs/Makefile | 19 | ||||
| -rwxr-xr-x | codecs/gsm/Makefile | 7 |
2 files changed, 18 insertions, 8 deletions
diff --git a/codecs/Makefile b/codecs/Makefile index 602215886..edf029219 100755 --- a/codecs/Makefile +++ b/codecs/Makefile @@ -11,6 +11,11 @@ # the GNU General Public License # +ifeq (${OSARCH},CYGWIN) +CYGSOLINK=-Wl,--out-implib=lib$@.a -Wl,--export-all-symbols +CYGSOLIB=-L.. -L. -lasterisk.dll +endif + ifneq ($(wildcard g723.1/coder.c),) MODG723=codec_g723_1.so LIBG723=g723.1/libg723.a @@ -92,28 +97,28 @@ $(LIBILBC): $(MAKE) -C ilbc all $(MODILBC): codec_ilbc.o $(LIBILBC) - $(CC) $(SOLINK) -o $@ $< $(LIBILBC) + $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(LIBILBC) codec_g723_1.so : codec_g723_1.o $(LIBG723) - $(CC) $(SOLINK) -o $@ $< $(LIBG723) + $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(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) $(SOLINK) -o $@ $< $(LIBG723B) -lm + $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(LIBG723B) -lm codec_gsm.so: codec_gsm.o $(LIBGSMT) - $(CC) $(SOLINK) -o $@ $< $(LIBGSM) + $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(LIBGSM) $(MODSPEEX): codec_speex.o - $(CC) $(SOLINK) -o $@ $< $(LIBSPEEX) + $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(LIBSPEEX) codec_lpc10.so: codec_lpc10.o $(LIBLPC10) - $(CC) $(SOLINK) -o $@ $< $(LIBLPC10) -lm + $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(LIBLPC10) -lm %.so : %.o - $(CC) $(SOLINK) -o $@ $< + $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} ifneq ($(wildcard .depend),) include .depend diff --git a/codecs/gsm/Makefile b/codecs/gsm/Makefile index 76f9e89ae..a2b5dcf1e 100755 --- a/codecs/gsm/Makefile +++ b/codecs/gsm/Makefile @@ -36,6 +36,7 @@ WAV49 = -DWAV49 ######### which support MMX instructions. This should be newer pentiums, ######### ppro's, etc, as well as the AMD K6 and K7. The compile will ######### probably require gcc. +PROC=$(shell uname -m) ifneq (${OSARCH},Darwin) ifneq (${OSARCH},SunOS) @@ -90,7 +91,11 @@ PG = # CCFLAGS = -c -O CC ?= gcc -CCFLAGS += -c -DNeedFunctionPrototypes=1 -funroll-loops -fPIC $(OPTIMIZE) +CCFLAGS += -c -DNeedFunctionPrototypes=1 -funroll-loops $(OPTIMIZE) +ifneq ($(findstring CYGWIN,${OSARCH}),CYGWIN) +CCFLAGS += -fPIC +endif + LD = $(CC) |