encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.

This commit is contained in:
Alex Szpakowski 2019-04-17 20:41:05 -03:00
parent 9d7b26155a
commit 90b08881ab
4 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/video/uikit/SDL_uikitmessagebox.m
View File

@ -55,7 +55,6 @@ UIKit_WaitUntilMessageBoxClosed(const SDL_MessageBoxData *messageboxdata, int *c
static BOOL static BOOL
UIKit_ShowMessageBoxAlertController(const SDL_MessageBoxData *messageboxdata, int *buttonid) UIKit_ShowMessageBoxAlertController(const SDL_MessageBoxData *messageboxdata, int *buttonid)
{ {
#ifdef __IPHONE_8_0
int i; int i;
int __block clickedindex = messageboxdata->numbuttons; int __block clickedindex = messageboxdata->numbuttons;
const SDL_MessageBoxButtonData *buttons = messageboxdata->buttons; const SDL_MessageBoxButtonData *buttons = messageboxdata->buttons;
@ -125,9 +124,6 @@ UIKit_ShowMessageBoxAlertController(const SDL_MessageBoxData *messageboxdata, in
*buttonid = messageboxdata->buttons[clickedindex].buttonid; *buttonid = messageboxdata->buttons[clickedindex].buttonid;
return YES; return YES;
#else
return NO;
#endif /* __IPHONE_8_0 */
} }
/* UIAlertView is deprecated in iOS 8+ in favor of UIAlertController. */ /* UIAlertView is deprecated in iOS 8+ in favor of UIAlertController. */

5
src/video/uikit/SDL_uikitmetalview.m
View File

@ -90,12 +90,9 @@ UIKit_Mtl_AddMetalView(SDL_Window* window)
* dimensions of the screen rather than the dimensions in points * dimensions of the screen rather than the dimensions in points
* yielding high resolution on retine displays. * yielding high resolution on retine displays.
*/ */
#ifdef __IPHONE_8_0
if ([data.uiwindow.screen respondsToSelector:@selector(nativeScale)]) { if ([data.uiwindow.screen respondsToSelector:@selector(nativeScale)]) {
scale = data.uiwindow.screen.nativeScale; scale = data.uiwindow.screen.nativeScale;
} else } else {
#endif
{
scale = data.uiwindow.screen.scale; scale = data.uiwindow.screen.scale;
} }
} }

5
src/video/uikit/SDL_uikitopengles.m
View File

@ -168,12 +168,9 @@ UIKit_GL_CreateContext(_THIS, SDL_Window * window)
/* Set the scale to the natural scale factor of the screen - the /* Set the scale to the natural scale factor of the screen - the
* backing dimensions of the OpenGL view will match the pixel * backing dimensions of the OpenGL view will match the pixel
* dimensions of the screen rather than the dimensions in points. */ * dimensions of the screen rather than the dimensions in points. */
#ifdef __IPHONE_8_0
if ([data.uiwindow.screen respondsToSelector:@selector(nativeScale)]) { if ([data.uiwindow.screen respondsToSelector:@selector(nativeScale)]) {
scale = data.uiwindow.screen.nativeScale; scale = data.uiwindow.screen.nativeScale;
} else } else {
#endif
{
scale = data.uiwindow.screen.scale; scale = data.uiwindow.screen.scale;
} }
} }

3
src/video/uikit/SDL_uikitwindow.m
View File

@ -77,7 +77,8 @@
@end @end
static int SetupWindowData(_THIS, SDL_Window *window, UIWindow *uiwindow, SDL_bool created) static int
SetupWindowData(_THIS, SDL_Window *window, UIWindow *uiwindow, SDL_bool created)
{ {
SDL_VideoDisplay *display = SDL_GetDisplayForWindow(window); SDL_VideoDisplay *display = SDL_GetDisplayForWindow(window);
SDL_DisplayData *displaydata = (__bridge SDL_DisplayData *) display->driverdata; SDL_DisplayData *displaydata = (__bridge SDL_DisplayData *) display->driverdata;