Mercurial > mxe-octave

comparison src/portaudio-1-win32.patch @ 972:e5d55b815b89

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