From: John Melas <john@jmelas.gr>
Date: Mon, 21 Dec 2020 10:14:19 +0000 (+0200)
Subject: replace Carbon with CoreFoundation and CoreServices
X-Git-Tag: v19.7.0~18
X-Git-Url: https://andrewgundersen.net/repos?a=commitdiff_plain;h=dd857f610851c444ba44c7bbed883eda0325dd4a;p=portaudio

replace Carbon with CoreFoundation and CoreServices
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5c5f748..122fe93 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -264,11 +264,12 @@ ELSE()
       FIND_LIBRARY(COREAUDIO_LIBRARY CoreAudio REQUIRED)
       FIND_LIBRARY(AUDIOTOOLBOX_LIBRARY AudioToolbox REQUIRED)
       FIND_LIBRARY(AUDIOUNIT_LIBRARY AudioUnit REQUIRED)
-      FIND_LIBRARY(CARBON_LIBRARY Carbon REQUIRED)
-      MARK_AS_ADVANCED(COREAUDIO_LIBRARY AUDIOTOOLBOX_LIBRARY AUDIOUNIT_LIBRARY CARBON_LIBRARY)
-      SET(PA_LIBRARY_DEPENDENCIES ${PA_LIBRARY_DEPENDENCIES} ${COREAUDIO_LIBRARY} ${AUDIOTOOLBOX_LIBRARY} ${AUDIOUNIT_LIBRARY} ${CARBON_LIBRARY})
+      FIND_LIBRARY(COREFOUNDATION_LIBRARY CoreFoundation REQUIRED)
+      FIND_LIBRARY(CORESERVICES_LIBRARY CoreServices REQUIRED)
+      MARK_AS_ADVANCED(COREAUDIO_LIBRARY AUDIOTOOLBOX_LIBRARY AUDIOUNIT_LIBRARY COREFOUNDATION_LIBRARY CORESERVICES_LIBRARY)
+      SET(PA_LIBRARY_DEPENDENCIES ${PA_LIBRARY_DEPENDENCIES} ${COREAUDIO_LIBRARY} ${AUDIOTOOLBOX_LIBRARY} ${AUDIOUNIT_LIBRARY} ${COREFOUNDATION_LIBRARY} ${CORESERVICES_LIBRARY})
       SET(PA_PRIVATE_COMPILE_DEFINITIONS ${PA_PRIVATE_COMPILE_DEFINITIONS} PA_USE_COREAUDIO)
-      SET(PA_PKGCONFIG_LDFLAGS "${PA_PKGCONFIG_LDFLAGS} -framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon")
+      SET(PA_PKGCONFIG_LDFLAGS "${PA_PKGCONFIG_LDFLAGS} -framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework CoreFoundation -framework CoreServices")
     ENDIF()
 
   ELSEIF(UNIX)
diff --git a/configure b/configure
index c95c18b..42d22a0 100755
Binary files a/configure and b/configure differ
diff --git a/configure.in b/configure.in
index a226029..1727df7 100644
--- a/configure.in
+++ b/configure.in
@@ -205,7 +205,7 @@ case "${host_os}" in
         AC_DEFINE(PA_USE_COREAUDIO,1)
 
         CFLAGS="$CFLAGS -I\$(top_srcdir)/src/os/unix -Wno-deprecated -Werror"
-        LIBS="-framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon"
+        LIBS="-framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework CoreFoundation -framework CoreServices"
 
         if test "x$enable_mac_universal" = "xyes" ; then
            case `xcodebuild -version | sed -n 's/Xcode \(.*\)/\1/p'` in
diff --git a/doc/src/tutorial/compile_mac_coreaudio.dox b/doc/src/tutorial/compile_mac_coreaudio.dox
index e16ce33..068391e 100644
--- a/doc/src/tutorial/compile_mac_coreaudio.dox
+++ b/doc/src/tutorial/compile_mac_coreaudio.dox
@@ -99,7 +99,7 @@ You will need to add the following frameworks to your XCode project:
  - AudioToolbox.framework
  - AudioUnit.framework
  - CoreServices.framework
- - Carbon.framework
+ - CoreFoundation.framework
 
 @section comp_mac_ca_5 Using the Library in Other Projects