Browse Source

90% of iOS users on the App Store run at least iOS 7, so it doesn't make sense to support building using an SDK that doesn't support iOS 7. The minimum supported runtime version is still iOS 5.1.

Alex Szpakowski 11 years ago
parent
commit
6d552cae38

+ 2 - 5
src/video/uikit/SDL_uikitopenglview.m

@@ -75,14 +75,11 @@
             return nil;
             return nil;
         }
         }
 
 
-#ifdef __IPHONE_7_0
-        /* sRGB context support was added in iOS 7 */
         BOOL hasiOS7 = [[UIDevice currentDevice].systemVersion compare:@"7.0" options:NSNumericSearch] != NSOrderedAscending;
         BOOL hasiOS7 = [[UIDevice currentDevice].systemVersion compare:@"7.0" options:NSNumericSearch] != NSOrderedAscending;
         if (sRGB && hasiOS7) {
         if (sRGB && hasiOS7) {
+             /* sRGB EAGL drawable support was added in iOS 7 */
             colorFormat = kEAGLColorFormatSRGBA8;
             colorFormat = kEAGLColorFormatSRGBA8;
-        } else
-#endif
-        if (rBits >= 8 && gBits >= 8 && bBits >= 8) {
+        } else if (rBits >= 8 && gBits >= 8 && bBits >= 8) {
             /* if user specifically requests rbg888 or some color format higher than 16bpp */
             /* if user specifically requests rbg888 or some color format higher than 16bpp */
             colorFormat = kEAGLColorFormatRGBA8;
             colorFormat = kEAGLColorFormatRGBA8;
         } else {
         } else {

+ 0 - 5
src/video/uikit/SDL_uikitviewcontroller.m

@@ -124,13 +124,8 @@
 
 
 - (UIStatusBarStyle)preferredStatusBarStyle
 - (UIStatusBarStyle)preferredStatusBarStyle
 {
 {
-#ifdef __IPHONE_7_0
     /* We assume most games don't have a bright white background. */
     /* We assume most games don't have a bright white background. */
     return UIStatusBarStyleLightContent;
     return UIStatusBarStyleLightContent;
-#else
-    /* This method is only used in iOS 7+, so the return value here isn't important. */
-    return UIStatusBarStyleBlackTranslucent;
-#endif
 }
 }
 
 
 @end
 @end

+ 1 - 2
src/video/uikit/SDL_uikitwindow.m

@@ -248,11 +248,10 @@ UIKit_SetWindowFullscreen(_THIS, SDL_Window * window, SDL_VideoDisplay * display
         [UIApplication sharedApplication].statusBarHidden = NO;
         [UIApplication sharedApplication].statusBarHidden = NO;
     }
     }
 
 
-#ifdef __IPHONE_7_0
+    /* iOS 7+ won't update the status bar until we tell it to. */
     if ([viewcontroller respondsToSelector:@selector(setNeedsStatusBarAppearanceUpdate)]) {
     if ([viewcontroller respondsToSelector:@selector(setNeedsStatusBarAppearanceUpdate)]) {
         [viewcontroller setNeedsStatusBarAppearanceUpdate];
         [viewcontroller setNeedsStatusBarAppearanceUpdate];
     }
     }
-#endif
 
 
     if (fullscreen || (window->flags & SDL_WINDOW_BORDERLESS)) {
     if (fullscreen || (window->flags & SDL_WINDOW_BORDERLESS)) {
         bounds = [displaydata->uiscreen bounds];
         bounds = [displaydata->uiscreen bounds];