From: dmitrykos <dmitrykos@0f58301d-fd10-0410-b4af-bbb618454e57>
Date: Mon, 21 Feb 2011 08:02:21 +0000 (+0000)
Subject: fixed build by reverting 1604 revision where 'pa_ringbuffer.o' dependency was added... 
X-Git-Tag: pa_stable_v19_20110326_r1647~40
X-Git-Url: https://andrewgundersen.net/repos?a=commitdiff_plain;h=b906a9d3365f41f53f0ab435844be6c592127c27;p=portaudio

fixed build by reverting 1604 revision where 'pa_ringbuffer.o' dependency was added to Makefile.in, modified configure.in for WASAPI build and added explicit 'pa_ringbuffer.o' dependency there instead
---

diff --git a/Makefile.in b/Makefile.in
index 7d0c729..87e6c7c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -56,7 +56,6 @@ COMMON_OBJS = \
 	src/common/pa_process.o \
 	src/common/pa_stream.o \
 	src/common/pa_trace.o \
-	src/common/pa_ringbuffer.o \
 	src/hostapi/skeleton/pa_hostapi_skeleton.o
 
 TESTS = \
diff --git a/configure.in b/configure.in
index 9f1061d..c71e630 100644
--- a/configure.in
+++ b/configure.in
@@ -262,7 +262,7 @@ case "${host_os}" in
         fi
 
         if [[ "x$with_wasapi" = "xyes" ]]; then
-            add_objects src/hostapi/wasapi/pa_win_wasapi.o src/os/win/pa_win_hostapis.o src/os/win/pa_win_util.o src/os/win/pa_win_waveformat.o
+            add_objects src/hostapi/wasapi/pa_win_wasapi.o src/common/pa_ringbuffer.o src/os/win/pa_win_hostapis.o src/os/win/pa_win_util.o src/os/win/pa_win_waveformat.o
             LIBS="-lwinmm -lm -lole32 -luuid"
             DLL_LIBS="${DLL_LIBS} -lwinmm"
             CFLAGS="$CFLAGS -I\$(top_srcdir)/src/common -I\$(top_srcdir)/src/hostapi/wasapi/mingw-include -UPA_USE_WASAPI -DPA_USE_WASAPI=1"