retronetworking
/
freeswitch
13
0
Fork 0
Code Pull Requests Releases Activity

fix portaudio bsd build and remove gmakeisms from the portaudio lib makefile 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@4765 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2007-03-25 01:11:03 +00:00
parent a7909fb093
commit b65f2273d0
2 changed files with 53 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
libs/portaudio/Makefile.in
View File

@ -57,61 +57,61 @@ COMMON_OBJS = \
src/common/pa_trace.o
TESTS = \
bin/paqa_devs \
bin/paqa_errs \
bin/patest1 \
bin/patest_buffer \
bin/patest_callbackstop \
bin/patest_clip \
bin/patest_dither \
bin/patest_hang \
bin/patest_in_overflow \
bin/patest_latency \
bin/patest_leftright \
bin/patest_longsine \
bin/patest_many \
bin/patest_maxsines \
bin/patest_multi_sine \
bin/patest_out_underflow \
bin/patest_pink \
bin/patest_prime \
bin/patest_read_record \
bin/patest_read_write_wire \
bin/patest_record \
bin/patest_ringmix \
bin/patest_saw \
bin/patest_sine8 \
bin/patest_sine \
bin/patest_sine_formats \
bin/patest_sine_time \
bin/patest_start_stop \
bin/patest_stop \
bin/patest_stop_playout \
bin/patest_toomanysines \
bin/patest_underflow \
bin/patest_wire \
bin/patest_write_sine \
bin/pa_devs \
bin/pa_fuzz \
bin/pa_minlat
test/paqa_devs \
test/paqa_errs \
test/patest1 \
test/patest_buffer \
test/patest_callbackstop \
test/patest_clip \
test/patest_dither \
test/patest_hang \
test/patest_in_overflow \
test/patest_latency \
test/patest_leftright \
test/patest_longsine \
test/patest_many \
test/patest_maxsines \
test/patest_multi_sine \
test/patest_out_underflow \
test/patest_pink \
test/patest_prime \
test/patest_read_record \
test/patest_read_write_wire \
test/patest_record \
test/patest_ringmix \
test/patest_saw \
test/patest_sine8 \
test/patest_sine \
test/patest_sine_formats \
test/patest_sine_time \
test/patest_start_stop \
test/patest_stop \
test/patest_stop_playout \
test/patest_toomanysines \
test/patest_underflow \
test/patest_wire \
test/patest_write_sine \
test/pa_devs \
test/pa_fuzz \
test/pa_minlat
# Most of these don't compile yet. Put them in TESTS, above, if
# you want to try to compile them...
ALL_TESTS = \
$(TESTS) \
bin/patest_sync \
bin/debug_convert \
bin/debug_dither_calc \
bin/debug_dual \
bin/debug_multi_in \
bin/debug_multi_out \
bin/debug_record \
bin/debug_record_reuse \
bin/debug_sine_amp \
bin/debug_sine \
bin/debug_sine_formats \
bin/debug_srate \
bin/debug_test1
test/patest_sync \
test/debug_convert \
test/debug_dither_calc \
test/debug_dual \
test/debug_multi_in \
test/debug_multi_out \
test/debug_record \
test/debug_record_reuse \
test/debug_sine_amp \
test/debug_sine \
test/debug_sine_formats \
test/debug_srate \
test/debug_test1
OBJS = $(COMMON_OBJS) $(OTHER_OBJS)
@ -128,9 +128,8 @@ tests: bin-stamp $(TESTS)
lib/$(PALIB): lib-stamp $(LTOBJS) $(MAKEFILE) $(PAINC)
$(LIBTOOL) --mode=link $(CC) $(PA_LDFLAGS) -o lib/$(PALIB) $(LTOBJS) $(DLL_LIBS)
$(ALL_TESTS): bin/%: lib/$(PALIB) $(MAKEFILE) $(PAINC) test/%.c
$(LIBTOOL) --mode=link $(CC) -o $@ $(CFLAGS) $(top_srcdir)/test/$*.c lib/$(PALIB) $(LIBS)
$(ALL_TESTS): lib/$(PALIB) $(MAKEFILE) $(PAINC)
$(LIBTOOL) --mode=link $(CC) -o $@ $(CFLAGS) $(top_srcdir)/$@.c lib/$(PALIB) $(LIBS)
install: lib/$(PALIB) portaudio-2.0.pc
$(INSTALL) -d $(DESTDIR)$(libdir)

2
libs/portaudio/src/common/pa_ringbuffer.c
View File

@ -71,7 +71,7 @@
*
****************/
#if defined(HAVE_LIBKERN_OSATOMIC_H) && defined(__APPLE__) || defined(__FreeBSD__)
#if defined(HAVE_LIBKERN_OSATOMIC_H) && (defined(__APPLE__) || defined(__FreeBSD__))
# include <libkern/OSAtomic.h>
/* Here are the memory barrier functions. Mac OS X and FreeBSD only provide
full memory barriers, so the three types of barriers are the same. */