From 1213fe79d8160f879e982c9aebe5f12dad190d54 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Fri, 14 Jun 2019 13:56:42 -0700 Subject: [PATCH] Worked around "Undefined symbol: ___isPlatformVersionAtLeast()" link error on Xcode 11 beta --- src/render/metal/SDL_render_metal.m | 9 +++++---- src/video/uikit/SDL_uikitvideo.m | 5 ++++- src/video/uikit/SDL_uikitviewcontroller.m | 5 ++++- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/render/metal/SDL_render_metal.m b/src/render/metal/SDL_render_metal.m index 3a85cad269a54..9233b8fee3c32 100644 --- a/src/render/metal/SDL_render_metal.m +++ b/src/render/metal/SDL_render_metal.m @@ -1733,11 +1733,12 @@ - (void)dealloc #endif #else #ifdef __IPHONE_11_0 - if (@available(iOS 11.0, *)) { - if ([mtldevice supportsFeatureSet:MTLFeatureSet_iOS_GPUFamily4_v1]) { - maxtexsize = 16384; - } +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wunguarded-availability-new" + if ([mtldevice supportsFeatureSet:MTLFeatureSet_iOS_GPUFamily4_v1]) { + maxtexsize = 16384; } else +#pragma clang diagnostic pop #endif #ifdef __IPHONE_10_0 if ([mtldevice supportsFeatureSet:MTLFeatureSet_iOS_GPUFamily3_v1]) { diff --git a/src/video/uikit/SDL_uikitvideo.m b/src/video/uikit/SDL_uikitvideo.m index 7c21d16c2de3a..34b63f7b74677 100644 --- a/src/video/uikit/SDL_uikitvideo.m +++ b/src/video/uikit/SDL_uikitvideo.m @@ -230,10 +230,13 @@ static void UIKit_DeleteDevice(SDL_VideoDevice * device) if (focus) { SDL_WindowData *data = (__bridge SDL_WindowData *) focus->driverdata; if (data != nil) { - if (@available(iOS 11.0, *)) { +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wunguarded-availability-new" + if ([data.viewcontroller respondsToSelector:@selector(setNeedsUpdateOfHomeIndicatorAutoHidden)]) { [data.viewcontroller performSelectorOnMainThread:@selector(setNeedsUpdateOfHomeIndicatorAutoHidden) withObject:nil waitUntilDone:NO]; [data.viewcontroller performSelectorOnMainThread:@selector(setNeedsUpdateOfScreenEdgesDeferringSystemGestures) withObject:nil waitUntilDone:NO]; } +#pragma clang diagnostic pop } } #endif /* !TARGET_OS_TV */ diff --git a/src/video/uikit/SDL_uikitviewcontroller.m b/src/video/uikit/SDL_uikitviewcontroller.m index e1f4cdc45c0e4..17221ebb06b04 100644 --- a/src/video/uikit/SDL_uikitviewcontroller.m +++ b/src/video/uikit/SDL_uikitviewcontroller.m @@ -57,10 +57,13 @@ @autoreleasepool { SDL_uikitviewcontroller *viewcontroller = (__bridge SDL_uikitviewcontroller *) userdata; viewcontroller.homeIndicatorHidden = (hint && *hint) ? SDL_atoi(hint) : -1; - if (@available(iOS 11.0, *)) { +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wunguarded-availability-new" + if ([viewcontroller respondsToSelector:@selector(setNeedsUpdateOfHomeIndicatorAutoHidden)]) { [viewcontroller setNeedsUpdateOfHomeIndicatorAutoHidden]; [viewcontroller setNeedsUpdateOfScreenEdgesDeferringSystemGestures]; } +#pragma clang diagnostic pop } } #endif