From 2a7f8fcd7a5f64835be907c5dd56dc962793e7b8 Mon Sep 17 00:00:00 2001 From: Phil Burk Date: Sat, 3 Oct 2020 16:54:12 -0700 Subject: [PATCH] build: add new Mac SDKs to configure Add SDK 10.14 and 10.15 to configure.in Removed i386 and PPC architectures on Mac because they are deprecated and make fails if they are used. The configure file was generated from the configure.in file by entering this on Linux: aclocal autoconf Fixes 308 --- configure | Bin 576035 -> 576931 bytes configure.in | 22 ++++++++++++++-------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/configure b/configure index e1703271b253ccf2d992b39eff5420e16a83d319..34a341bdd51bb1616ed8d3eb63ae12868f780726 100755 GIT binary patch delta 621 zcmZ2HMS1aT&lqu9G=<4F;qe?5pa4DdOAajt|2qv6`thF903ZXQCW-2HoCdU^PrIy(uJH^@> zD241eTP?VGP)}iqpbG%`F=&pqO+YaQMF%nmi4A1NAWVTvz!@5pnXFk`}Pfq9K{&`^yJp9 delta 168 zcmZ2HTY2#mOT}hnq<`?bDg`02AZofI35r~<9m>Gy!fS7gr z&Dm_HR`VDdY1J6(833`N=H!Wsq^BQnXHVI#<-vZRbNYJ^c9H3O9T)|s{|siIE}Us> zVWv=FVHR&@qEJwf48q%|gs{&Mn10@sU10i}ICdV9^2FlAf=vC~%)In+-ORk?oYIuk OcD+>g?Ru#kr5OOqkwV-6 diff --git a/configure.in b/configure.in index b2129ba..90a811c 100644 --- a/configure.in +++ b/configure.in @@ -210,7 +210,7 @@ case "${host_os}" in if test "x$enable_mac_universal" = "xyes" ; then case `xcodebuild -version | sed -n 's/Xcode \(.*\)/\1/p'` in - [12]*|3.0|3.1) + 3.0|3.1) dnl In pre-3.2 versions of Xcode, xcodebuild doesn't dnl support -sdk, so we can't use that to look for dnl SDKs. However, in those versions of Xcode, the @@ -261,6 +261,12 @@ case "${host_os}" in elif xcodebuild -version -sdk macosx10.13 Path >/dev/null 2>&1 ; then mac_version_min="-mmacosx-version-min=10.4" mac_sysroot="-isysroot `xcodebuild -version -sdk macosx10.13 Path`" + elif xcodebuild -version -sdk macosx10.14 Path >/dev/null 2>&1 ; then + mac_version_min="-mmacosx-version-min=10.4" + mac_sysroot="-isysroot `xcodebuild -version -sdk macosx10.14 Path`" + elif xcodebuild -version -sdk macosx10.15 Path >/dev/null 2>&1 ; then + mac_version_min="-mmacosx-version-min=10.4" + mac_sysroot="-isysroot `xcodebuild -version -sdk macosx10.15 Path`" else AC_MSG_ERROR([Could not find 10.5 to 10.13 SDK.]) fi @@ -269,7 +275,7 @@ case "${host_os}" in dnl Pick which architectures to build for based on what dnl the compiler supports. mac_arches="" - for arch in i386 x86_64 ppc ppc64 + for arch in x86_64 do save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -arch $arch" @@ -319,12 +325,12 @@ case "${host_os}" in DLL_LIBS="${DLL_LIBS} -lwinmm -lm -lole32 -luuid" CFLAGS="$CFLAGS -ffast-math -fomit-frame-pointer -I\$(top_srcdir)/src/hostapi/asio -I$ASIODIR/host/pc -I$ASIODIR/common -I$ASIODIR/host -UPA_USE_ASIO -DPA_USE_ASIO=1 -DWINDOWS" - dnl Setting the windows version flags below resolves a conflict between Interlocked* - dnl definitions in mingw winbase.h and Interlocked* hacks in ASIO SDK combase.h + dnl Setting the windows version flags below resolves a conflict between Interlocked* + dnl definitions in mingw winbase.h and Interlocked* hacks in ASIO SDK combase.h dnl combase.h is included by asiodrvr.h - dnl PortAudio does not actually require Win XP (winver 501) APIs + dnl PortAudio does not actually require Win XP (winver 501) APIs CFLAGS="$CFLAGS -D_WIN32_WINNT=0x0501 -DWINVER=0x0501" - + CXXFLAGS="$CFLAGS" fi @@ -383,7 +389,7 @@ case "${host_os}" in dnl The _REENTRANT option for pthread safety. Perhaps not necessary but it 'll do no harm. dnl THREAD_CFLAGS="-D_REENTRANT" - + OTHER_OBJS="pa_sgi/pa_sgi.o src/os/unix/pa_unix_hostapis.o src/os/unix/pa_unix_util.o" dnl SGI books say -lpthread should be the last of the libs mentioned. @@ -397,7 +403,7 @@ case "${host_os}" in dnl Unix configuration CFLAGS="$CFLAGS -I\$(top_srcdir)/src/os/unix" - + AC_CHECK_LIB(pthread, pthread_create,[have_pthread="yes"], AC_MSG_ERROR([libpthread not found!])) -- 2.43.0