summaryrefslogtreecommitdiffstats
path: root/src/portaudio-1-win32.patch
diff options
context:
space:
mode:
authorVolker Grabsch <vog@notjusthosting.com>2010-05-14 17:59:46 (GMT)
committerVolker Grabsch <vog@notjusthosting.com>2010-05-14 17:59:46 (GMT)
commit6f45b35ff46fcc339715d0360a9a998e0ef7cb2b (patch)
treef482f0f61d65733f3aed489715f9b5b44bb6c781 /src/portaudio-1-win32.patch
parent40f4cf1fbfe702ed8fce45868f88f4b52f3ae227 (diff)
downloadmxe-6f45b35ff46fcc339715d0360a9a998e0ef7cb2b.zip
mxe-6f45b35ff46fcc339715d0360a9a998e0ef7cb2b.tar.gz
mxe-6f45b35ff46fcc339715d0360a9a998e0ef7cb2b.tar.bz2
improved naming of patch files
Diffstat (limited to 'src/portaudio-1-win32.patch')
-rw-r--r--src/portaudio-1-win32.patch89
1 files changed, 89 insertions, 0 deletions
diff --git a/src/portaudio-1-win32.patch b/src/portaudio-1-win32.patch
new file mode 100644
index 0000000..a6f359f
--- /dev/null
+++ b/src/portaudio-1-win32.patch
@@ -0,0 +1,89 @@
+This file is part of mingw-cross-env.
+See doc/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@