1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
|
This file is part of MXE.
See index.html for further information.
diff -ru portaudio-orig/configure.in portaudio/configure.in
--- portaudio-orig/configure.in 2007-11-13 22:22:56.000000000 +0100
+++ portaudio/configure.in 2010-01-23 17:04:37.000000000 +0100
@@ -139,6 +139,7 @@
dnl Mac OS X configuration
AC_DEFINE(PA_USE_COREAUDIO)
+ CFLAGS="$CFLAGS -I\$(top_srcdir)/src/os/unix"
if [[ -d /Developer/SDKs/MacOSX10.5.sdk ]] ; then
SHARED_FLAGS="-Werror -framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon -dynamiclib -arch x86_64 -arch ppc64 -arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.3";
CFLAGS="-Werror $CFLAGS -arch x86_64 -arch ppc64 -arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.3";
@@ -167,6 +168,7 @@
dnl MingW configuration
echo "WINAPI: $with_winapi"
+ CFLAGS="$CFLAGS -I\$(top_srcdir)/src/os/win"
if [[ $with_winapi = "directx" ]] ; then
if [[ $with_dxdir ]] ; then
DXDIR="$with_dxdir";
@@ -174,15 +176,15 @@
DXDIR="/usr/local/dx7sdk";
fi
echo "DXDIR: $DXDIR"
- OTHER_OBJS="src/hostapi/dsound/pa_win_ds.o src/hostapi/dsound/pa_win_ds_dynlink.o src/os/win/pa_win_hostapis.o src/os/win/pa_win_util.o";
+ OTHER_OBJS="src/hostapi/dsound/pa_win_ds.o src/hostapi/dsound/pa_win_ds_dynlink.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 -ldsound -lole32";
PADLL="portaudio.dll";
THREAD_CFLAGS="-mthreads"
SHARED_FLAGS="-shared";
- DLL_LIBS="${DLL_LIBS} -lwinmm -lm -L./dx7sdk/lib -ldsound -lole32";
+ DLL_LIBS="${DLL_LIBS} -lwinmm -lm -L${DXDIR}/lib -ldsound -lole32";
#VC98="\"/c/Program Files/Microsoft Visual Studio/VC98/Include\"";
#CFLAGS="$CFLAGS -I$VC98 -DPA_NO_WMME -DPA_NO_ASIO";
- CFLAGS="$CFLAGS -I\$(top_srcdir)/include -I$DXDIR/include -DPA_NO_WMME -DPA_NO_ASIO" -DPA_NO_WDMKS;
+ CFLAGS="$CFLAGS -I\$(top_srcdir)/include -I$DXDIR/include -DPA_NO_WMME -DPA_NO_ASIO -DPA_NO_WDMKS";
elif [[ $with_winapi = "asio" ]] ; then
if [[ $with_asiodir ]] ; then
ASIODIR="$with_asiodir";
@@ -228,9 +230,10 @@
cygwin* )
dnl Cygwin configuration
-
+ CFLAGS="$CFLAGS -I\$(top_srcdir)/src/os/win"
OTHER_OBJS="src/hostapi/wmme/pa_win_wmme.o src/os/win/pa_win_hostapis.o src/os/win/pa_win_util.o";
CFLAGS="$CFLAGS -DPA_NO_DS -DPA_NO_WDMKS -DPA_NO_ASIO -DPA_NO_WASAPI"
+
LIBS="-lwinmm -lm";
PADLL="portaudio.dll";
THREAD_CFLAGS="-mthreads"
@@ -242,6 +245,7 @@
dnl SGI IRIX audio library (AL) configuration (Pieter, oct 2-13, 2003).
dnl The 'dmedia' library is needed to read the Unadjusted System Time (UST).
dnl
+ CFLAGS="$CFLAGS -I\$(top_srcdir)/src/os/unix"
AC_CHECK_LIB(pthread, pthread_create, , AC_MSG_ERROR([IRIX posix thread library not found!]))
AC_CHECK_LIB(audio, alOpenPort, , AC_MSG_ERROR([IRIX audio library not found!]))
AC_CHECK_LIB(dmedia, dmGetUST, , AC_MSG_ERROR([IRIX digital media library not found!]))
@@ -271,6 +275,7 @@
,
AC_MSG_ERROR([libpthread not found!]))
+ CFLAGS="$CFLAGS -I\$(top_srcdir)/src/os/unix"
if [[ $have_alsa = "yes" ] && [ $with_alsa != "no" ]] ; then
DLL_LIBS="$DLL_LIBS -lasound"
OTHER_OBJS="$OTHER_OBJS src/hostapi/alsa/pa_linux_alsa.o"
@@ -305,6 +310,7 @@
OTHER_OBJS="$OTHER_OBJS src/os/unix/pa_unix_hostapis.o src/os/unix/pa_unix_util.o"
esac
CFLAGS="$CFLAGS $THREAD_CFLAGS"
+echo "CFLAGS: $CFLAGS"
if test "$enable_cxx" = "yes"; then
AC_CONFIG_SUBDIRS([bindings/cpp])
diff -ru portaudio-orig/Makefile.in portaudio/Makefile.in
--- portaudio-orig/Makefile.in 2007-10-24 17:29:04.000000000 +0200
+++ portaudio/Makefile.in 2010-01-23 17:00:40.000000000 +0100
@@ -16,7 +16,7 @@
libdir = @libdir@
includedir = @includedir@
CC = @CC@
-CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src/common -I$(top_srcdir)/src/os/unix @CFLAGS@ @DEFS@
+CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src/common @CFLAGS@ @DEFS@
LIBS = @LIBS@
AR = @AR@
RANLIB = @RANLIB@
|
