iOS: Remove code trying to support compilation on the iOS 7 SDK, the deployment target has been set to iOS 8 for years and there's other unconditionally compiled code that depends on newer SDKs so that code is useless.
authorAlex Szpakowski <slime73@gmail.com>
Wed, 17 Apr 2019 20:41:05 -0300
changeset 127078703488687ca
parent 12706 d7782848eb50
child 12708 f6193f829c8a
iOS: Remove code trying to support compilation on the iOS 7 SDK, the deployment target has been set to iOS 8 for years and there's other unconditionally compiled code that depends on newer SDKs so that code is useless.
src/video/uikit/SDL_uikitmessagebox.m
src/video/uikit/SDL_uikitmetalview.m
src/video/uikit/SDL_uikitopengles.m
src/video/uikit/SDL_uikitwindow.m
     1.1 --- a/src/video/uikit/SDL_uikitmessagebox.m	Wed Apr 17 20:14:40 2019 -0300
     1.2 +++ b/src/video/uikit/SDL_uikitmessagebox.m	Wed Apr 17 20:41:05 2019 -0300
     1.3 @@ -55,7 +55,6 @@
     1.4  static BOOL
     1.5  UIKit_ShowMessageBoxAlertController(const SDL_MessageBoxData *messageboxdata, int *buttonid)
     1.6  {
     1.7 -#ifdef __IPHONE_8_0
     1.8      int i;
     1.9      int __block clickedindex = messageboxdata->numbuttons;
    1.10      const SDL_MessageBoxButtonData *buttons = messageboxdata->buttons;
    1.11 @@ -125,9 +124,6 @@
    1.12  
    1.13      *buttonid = messageboxdata->buttons[clickedindex].buttonid;
    1.14      return YES;
    1.15 -#else
    1.16 -    return NO;
    1.17 -#endif /* __IPHONE_8_0 */
    1.18  }
    1.19  
    1.20  /* UIAlertView is deprecated in iOS 8+ in favor of UIAlertController. */
     2.1 --- a/src/video/uikit/SDL_uikitmetalview.m	Wed Apr 17 20:14:40 2019 -0300
     2.2 +++ b/src/video/uikit/SDL_uikitmetalview.m	Wed Apr 17 20:41:05 2019 -0300
     2.3 @@ -90,12 +90,9 @@
     2.4           * dimensions of the screen rather than the dimensions in points
     2.5           * yielding high resolution on retine displays.
     2.6           */
     2.7 -#ifdef __IPHONE_8_0
     2.8          if ([data.uiwindow.screen respondsToSelector:@selector(nativeScale)]) {
     2.9              scale = data.uiwindow.screen.nativeScale;
    2.10 -        } else
    2.11 -#endif
    2.12 -        {
    2.13 +        } else {
    2.14              scale = data.uiwindow.screen.scale;
    2.15          }
    2.16      }
     3.1 --- a/src/video/uikit/SDL_uikitopengles.m	Wed Apr 17 20:14:40 2019 -0300
     3.2 +++ b/src/video/uikit/SDL_uikitopengles.m	Wed Apr 17 20:41:05 2019 -0300
     3.3 @@ -168,12 +168,9 @@
     3.4              /* Set the scale to the natural scale factor of the screen - the
     3.5               * backing dimensions of the OpenGL view will match the pixel
     3.6               * dimensions of the screen rather than the dimensions in points. */
     3.7 -#ifdef __IPHONE_8_0
     3.8              if ([data.uiwindow.screen respondsToSelector:@selector(nativeScale)]) {
     3.9                  scale = data.uiwindow.screen.nativeScale;
    3.10 -            } else
    3.11 -#endif
    3.12 -            {
    3.13 +            } else {
    3.14                  scale = data.uiwindow.screen.scale;
    3.15              }
    3.16          }
     4.1 --- a/src/video/uikit/SDL_uikitwindow.m	Wed Apr 17 20:14:40 2019 -0300
     4.2 +++ b/src/video/uikit/SDL_uikitwindow.m	Wed Apr 17 20:41:05 2019 -0300
     4.3 @@ -77,7 +77,8 @@
     4.4  @end
     4.5  
     4.6  
     4.7 -static int SetupWindowData(_THIS, SDL_Window *window, UIWindow *uiwindow, SDL_bool created)
     4.8 +static int
     4.9 +SetupWindowData(_THIS, SDL_Window *window, UIWindow *uiwindow, SDL_bool created)
    4.10  {
    4.11      SDL_VideoDisplay *display = SDL_GetDisplayForWindow(window);
    4.12      SDL_DisplayData *displaydata = (__bridge SDL_DisplayData *) display->driverdata;