diff options
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | sd/Library_sd.mk | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index f03615124aa4..2122bf97d41c 100644 --- a/configure.ac +++ b/configure.ac @@ -10354,6 +10354,10 @@ if test -n "$enable_sdremote" -a "$enable_sdremote" != "no"; then ENABLE_SDREMOTE=TRUE AC_MSG_CHECKING([whether to enable Bluetooth support in Impress remote control]) + if test $OS = MACOSX -a "$MAC_OS_X_VERSION_MAX_ALLOWED" -ge 101500; then + # The Bluetooth code doesn't compile with macOS SDK 10.15 + enable_sdremote_bluetooth=no + fi # If not explicitly enabled or disabled, default if test -z "$enable_sdremote_bluetooth"; then case "$OS" in diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk index a38184c07673..85953e285575 100644 --- a/sd/Library_sd.mk +++ b/sd/Library_sd.mk @@ -517,6 +517,10 @@ $(eval $(call gb_Library_add_objcxxobjects,sd,\ sd/source/ui/remotecontrol/OSXNetworkService \ )) +$(eval $(call gb_Library_use_system_darwin_frameworks,sd,\ + Foundation \ +)) + else # OS!=MACSOX ifeq ($(ENABLE_AVAHI),TRUE) @@ -565,7 +569,6 @@ $(eval $(call gb_Library_add_libs,sd,\ )) $(eval $(call gb_Library_use_system_darwin_frameworks,sd,\ - Foundation \ IOBluetooth \ )) |