Sfoglia il codice sorgente

Merge pull request #1566 from glassechidna/fix-old-sdks

Fix support for old iOS sdks (namely iOS 7.1 SDK)
Sean Taylor 11 anni fa
parent
commit
942092695e
1 ha cambiato i file con 14 aggiunte e 10 eliminazioni
  1. 14 10
      gameplay/src/PlatformiOS.mm

+ 14 - 10
gameplay/src/PlatformiOS.mm

@@ -1511,29 +1511,33 @@ bool Platform::canExit()
 
 unsigned int Platform::getDisplayWidth()
 {
-    if(NSFoundationVersionNumber <= NSFoundationVersionNumber_iOS_7_1)
+#ifdef NSFoundationVersionNumber_iOS_7_1
+    if (NSFoundationVersionNumber > NSFoundationVersionNumber_iOS_7_1)
     {
-        CGSize size = DeviceOrientedSize([__appDelegate.viewController interfaceOrientation]);
-        return size.width;
+        //iOS 8+
+        return [[UIScreen mainScreen] bounds].size.width * [[UIScreen mainScreen] scale];
     }
     else
+#endif
     {
-        //iOS 8+
-        return [[UIScreen mainScreen] bounds].size.width * [[UIScreen mainScreen] scale];
+        CGSize size = DeviceOrientedSize([__appDelegate.viewController interfaceOrientation]);
+        return size.width;
     }
 }
 
 unsigned int Platform::getDisplayHeight()
 {
-    if(NSFoundationVersionNumber <= NSFoundationVersionNumber_iOS_7_1)
+#ifdef NSFoundationVersionNumber_iOS_7_1
+    if (NSFoundationVersionNumber > NSFoundationVersionNumber_iOS_7_1)
     {
-        CGSize size = DeviceOrientedSize([__appDelegate.viewController interfaceOrientation]);
-        return size.height;
+        //iOS 8+
+        return [[UIScreen mainScreen] bounds].size.height * [[UIScreen mainScreen] scale];
     }
     else
+#endif
     {
-        //iOS 8+
-        return [[UIScreen mainScreen] bounds].size.height * [[UIScreen mainScreen] scale];
+        CGSize size = DeviceOrientedSize([__appDelegate.viewController interfaceOrientation]);
+        return size.height;
     }
 }