Revision 165:7e6e71a29886
| src/portaudio_20161030_catalina_patch/configure | ||
|---|---|---|
| 15821 | 15821 |
|
| 15822 | 15822 |
$as_echo "#define PA_USE_COREAUDIO 1" >>confdefs.h |
| 15823 | 15823 |
|
| 15824 |
|
|
| 15825 |
CFLAGS="$CFLAGS -I\$(top_srcdir)/src/os/unix -Wno-deprecated -Werror" |
|
| 15824 |
$as_echo "#define AUDIO_COMPONENT_FIX 1" >>confdefs.h |
|
| 15825 |
|
|
| 15826 |
|
|
| 15827 |
CFLAGS="$CFLAGS -I\$(top_srcdir)/src/os/unix -Wno-deprecated" |
|
| 15826 | 15828 |
LIBS="-framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon" |
| 15827 | 15829 |
|
| 15828 | 15830 |
if test "x$enable_mac_universal" = "xyes" ; then |
| ... | ... | |
| 15863 | 15865 |
elif xcodebuild -version -sdk macosx10.12 Path >/dev/null 2>&1 ; then |
| 15864 | 15866 |
mac_version_min="-mmacosx-version-min=10.4" |
| 15865 | 15867 |
mac_sysroot="-isysroot `xcodebuild -version -sdk macosx10.12 Path`" |
| 15868 |
elif xcodebuild -version -sdk macosx10.13 Path >/dev/null 2>&1 ; then |
|
| 15869 |
mac_version_min="-mmacosx-version-min=10.4" |
|
| 15870 |
mac_sysroot="-isysroot `xcodebuild -version -sdk macosx10.13 Path`" |
|
| 15871 |
elif xcodebuild -version -sdk macosx10.14 Path >/dev/null 2>&1 ; then |
|
| 15872 |
mac_version_min="-mmacosx-version-min=10.4" |
|
| 15873 |
mac_sysroot="-isysroot `xcodebuild -version -sdk macosx10.14 Path`" |
|
| 15866 | 15874 |
else |
| 15867 |
as_fn_error $? "Could not find 10.5 to 10.12 SDK." "$LINENO" 5
|
|
| 15875 |
as_fn_error $? "Could not find 10.5 to 10.14 SDK." "$LINENO" 5
|
|
| 15868 | 15876 |
fi |
| 15869 | 15877 |
esac |
| 15870 | 15878 |
|
| 15871 | 15879 |
mac_arches="" |
| 15872 |
for arch in i386 x86_64 ppc ppc64
|
|
| 15880 |
for arch in x86_64
|
|
| 15873 | 15881 |
do |
| 15874 | 15882 |
save_CFLAGS="$CFLAGS" |
| 15875 | 15883 |
CFLAGS="$CFLAGS -arch $arch" |
| src/portaudio_20161030_catalina_patch/configure.in | ||
|---|---|---|
| 203 | 203 |
dnl Mac OS X configuration |
| 204 | 204 |
|
| 205 | 205 |
AC_DEFINE(PA_USE_COREAUDIO,1) |
| 206 |
AC_DEFINE(AUDIO_COMPONENT_FIX,1) |
|
| 206 | 207 |
|
| 207 |
CFLAGS="$CFLAGS -I\$(top_srcdir)/src/os/unix -Wno-deprecated -Werror"
|
|
| 208 |
CFLAGS="$CFLAGS -I\$(top_srcdir)/src/os/unix -Wno-deprecated" |
|
| 208 | 209 |
LIBS="-framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon" |
| 209 | 210 |
|
| 210 | 211 |
if test "x$enable_mac_universal" = "xyes" ; then |
| ... | ... | |
| 258 | 259 |
elif xcodebuild -version -sdk macosx10.12 Path >/dev/null 2>&1 ; then |
| 259 | 260 |
mac_version_min="-mmacosx-version-min=10.4" |
| 260 | 261 |
mac_sysroot="-isysroot `xcodebuild -version -sdk macosx10.12 Path`" |
| 262 |
elif xcodebuild -version -sdk macosx10.13 Path >/dev/null 2>&1 ; then |
|
| 263 |
mac_version_min="-mmacosx-version-min=10.4" |
|
| 264 |
mac_sysroot="-isysroot `xcodebuild -version -sdk macosx10.13 Path`" |
|
| 265 |
elif xcodebuild -version -sdk macosx10.14 Path >/dev/null 2>&1 ; then |
|
| 266 |
mac_version_min="-mmacosx-version-min=10.4" |
|
| 267 |
mac_sysroot="-isysroot `xcodebuild -version -sdk macosx10.14 Path`" |
|
| 261 | 268 |
else |
| 262 |
AC_MSG_ERROR([Could not find 10.5 to 10.12 SDK.])
|
|
| 269 |
AC_MSG_ERROR([Could not find 10.5 to 10.14 SDK.])
|
|
| 263 | 270 |
fi |
| 264 | 271 |
esac |
| 265 | 272 |
|
| 266 | 273 |
dnl Pick which architectures to build for based on what |
| 267 | 274 |
dnl the compiler supports. |
| 268 | 275 |
mac_arches="" |
| 269 |
for arch in i386 x86_64 ppc ppc64
|
|
| 276 |
for arch in x86_64
|
|
| 270 | 277 |
do |
| 271 | 278 |
save_CFLAGS="$CFLAGS" |
| 272 | 279 |
CFLAGS="$CFLAGS -arch $arch" |
| src/portaudio_20161030_catalina_patch/src/hostapi/coreaudio/pa_mac_core.c | ||
|---|---|---|
| 1262 | 1262 |
desc.componentFlags = 0; |
| 1263 | 1263 |
desc.componentFlagsMask = 0; |
| 1264 | 1264 |
|
| 1265 |
#ifdef AUDIO_COMPONENT_FIX |
|
| 1266 |
DBUG( ( "Using AUDIO_COMPONENT_FIX logic." ) ); |
|
| 1267 |
#endif |
|
| 1268 |
|
|
| 1265 | 1269 |
/* -- find the component -- */ |
| 1266 | 1270 |
#ifndef AUDIO_COMPONENT_FIX |
| 1267 | 1271 |
comp = FindNextComponent( NULL, &desc ); |
Also available in: Unified diff