Kaydet (Commit) 1e95c8dd authored tarafından Tor Lillqvist's avatar Tor Lillqvist

The Bluetooth code doesn't compile with macOS SDK 10.15

Change-Id: I8fffa4cef9628e6872c881cd0cbdfe85495fa324
üst c6ab40a2
...@@ -10354,6 +10354,10 @@ if test -n "$enable_sdremote" -a "$enable_sdremote" != "no"; then ...@@ -10354,6 +10354,10 @@ if test -n "$enable_sdremote" -a "$enable_sdremote" != "no"; then
ENABLE_SDREMOTE=TRUE ENABLE_SDREMOTE=TRUE
AC_MSG_CHECKING([whether to enable Bluetooth support in Impress remote control]) 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 not explicitly enabled or disabled, default
if test -z "$enable_sdremote_bluetooth"; then if test -z "$enable_sdremote_bluetooth"; then
case "$OS" in case "$OS" in
......
...@@ -517,6 +517,10 @@ $(eval $(call gb_Library_add_objcxxobjects,sd,\ ...@@ -517,6 +517,10 @@ $(eval $(call gb_Library_add_objcxxobjects,sd,\
sd/source/ui/remotecontrol/OSXNetworkService \ sd/source/ui/remotecontrol/OSXNetworkService \
)) ))
$(eval $(call gb_Library_use_system_darwin_frameworks,sd,\
Foundation \
))
else # OS!=MACSOX else # OS!=MACSOX
ifeq ($(ENABLE_AVAHI),TRUE) ifeq ($(ENABLE_AVAHI),TRUE)
...@@ -565,7 +569,6 @@ $(eval $(call gb_Library_add_libs,sd,\ ...@@ -565,7 +569,6 @@ $(eval $(call gb_Library_add_libs,sd,\
)) ))
$(eval $(call gb_Library_use_system_darwin_frameworks,sd,\ $(eval $(call gb_Library_use_system_darwin_frameworks,sd,\
Foundation \
IOBluetooth \ IOBluetooth \
)) ))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment