diff options
15 files changed, 114 insertions, 0 deletions
diff --git a/backends/platform/ios7/ios7_video.mm b/backends/platform/ios7/ios7_video.mm index 7ce19f1f4b..35df78ea51 100644 --- a/backends/platform/ios7/ios7_video.mm +++ b/backends/platform/ios7/ios7_video.mm @@ -776,6 +776,7 @@ uint getSizeNextPOT(uint size) { GLfloat ratio = adjustedHeight / adjustedWidth; int height = (int)(screenWidth * ratio); //printf("Making rect (%u, %u)\n", screenWidth, height); + _gameScreenRect = CGRectMake(0, 0, screenWidth, height); overlayPortraitRatio = (_videoContext.overlayHeight * ratio) / _videoContext.overlayWidth; @@ -792,6 +793,32 @@ uint getSizeNextPOT(uint size) { [self setViewTransformation]; [self updateMouseCursorScaling]; + [self adjustViewFrameForSafeArea]; +} + +#ifndef __has_builtin +#define __has_builtin(x) 0 +#endif + +-(void)adjustViewFrameForSafeArea { +#if __has_builtin(__builtin_available) + if ( @available(iOS 11,*) ) { +#else + if ( [[UIApplication sharedApplication] keyWindow] respondsToSelector:@selector(safeAreaInsets) ) { +#endif + CGRect screenSize = [[UIScreen mainScreen] bounds]; + UIEdgeInsets inset = [[UIApplication sharedApplication] keyWindow].safeAreaInsets; + UIInterfaceOrientation orientation = [[UIApplication sharedApplication] statusBarOrientation]; + CGRect newFrame = screenSize; + if ( orientation == UIInterfaceOrientationPortrait ) { + newFrame = CGRectMake(screenSize.origin.x, screenSize.origin.y + inset.top, screenSize.size.width, screenSize.size.height - inset.top); + } else if ( orientation == UIInterfaceOrientationLandscapeLeft ) { + newFrame = CGRectMake(screenSize.origin.x, screenSize.origin.y, screenSize.size.width - inset.right, screenSize.size.height); + } else if ( orientation == UIInterfaceOrientationLandscapeRight ) { + newFrame = CGRectMake(screenSize.origin.x + inset.left, screenSize.origin.y, screenSize.size.width - inset.left, screenSize.size.height); + } + self.frame = newFrame; + } } - (void)setViewTransformation { diff --git a/devtools/create_project/xcode/create_project.xcodeproj/project.pbxproj b/devtools/create_project/xcode/create_project.xcodeproj/project.pbxproj index 55266a875f..9a75f2f7c0 100644 --- a/devtools/create_project/xcode/create_project.xcodeproj/project.pbxproj +++ b/devtools/create_project/xcode/create_project.xcodeproj/project.pbxproj @@ -186,6 +186,7 @@ F9A66C2E1396D36100CEE494 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_CXX_LIBRARY = "libc++"; ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_OPTIMIZATION_LEVEL = 0; @@ -199,6 +200,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; MACOSX_DEPLOYMENT_TARGET = 10.5; ONLY_ACTIVE_ARCH = YES; + OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)"; SDKROOT = macosx; }; name = Debug; @@ -206,6 +208,7 @@ F9A66C2F1396D36100CEE494 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_CXX_LIBRARY = "libc++"; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_PREPROCESSOR_DEFINITIONS = ( POSIX, @@ -215,6 +218,7 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; MACOSX_DEPLOYMENT_TARGET = 10.5; + OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)"; SDKROOT = macosx; }; name = Release; @@ -230,6 +234,7 @@ "$(inherited)", DEBUG, ); + MACOSX_DEPLOYMENT_TARGET = 10.8; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -242,6 +247,7 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; + MACOSX_DEPLOYMENT_TARGET = 10.8; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; diff --git a/dists/ios7/Images.xcassets/AppIcon.appiconset/Contents.json b/dists/ios7/Images.xcassets/AppIcon.appiconset/Contents.json index c37df59806..fe7b33c9d0 100644 --- a/dists/ios7/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/dists/ios7/Images.xcassets/AppIcon.appiconset/Contents.json @@ -1,6 +1,16 @@ { "images" : [ { + "idiom" : "iphone", + "size" : "20x20", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "20x20", + "scale" : "3x" + }, + { "size" : "29x29", "idiom" : "iphone", "filename" : "icon4-29@2x.png", @@ -37,6 +47,16 @@ "scale" : "3x" }, { + "idiom" : "ipad", + "size" : "20x20", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "20x20", + "scale" : "2x" + }, + { "size" : "29x29", "idiom" : "ipad", "filename" : "icon4-29.png", @@ -77,6 +97,11 @@ "idiom" : "ipad", "filename" : "icon4-83.5@2x.png", "scale" : "2x" + }, + { + "idiom" : "ios-marketing", + "size" : "1024x1024", + "scale" : "1x" } ], "info" : { diff --git a/dists/ios7/Images.xcassets/LaunchImage.launchimage/Contents.json b/dists/ios7/Images.xcassets/LaunchImage.launchimage/Contents.json index 40e3b1e3dd..2f76c4e70b 100644 --- a/dists/ios7/Images.xcassets/LaunchImage.launchimage/Contents.json +++ b/dists/ios7/Images.xcassets/LaunchImage.launchimage/Contents.json @@ -3,6 +3,60 @@ { "extent" : "full-screen", "idiom" : "iphone", + "subtype" : "2688h", + "filename" : "ScummVM-splash-1242x2688.png", + "minimum-system-version" : "12.0", + "orientation" : "portrait", + "scale" : "3x" + }, + { + "extent" : "full-screen", + "idiom" : "iphone", + "subtype" : "2688h", + "filename" : "ScummVM-splash-2688x1242.png", + "minimum-system-version" : "12.0", + "orientation" : "landscape", + "scale" : "3x" + }, + { + "extent" : "full-screen", + "idiom" : "iphone", + "subtype" : "1792h", + "filename" : "ScummVM-splash-828x1792.png", + "minimum-system-version" : "12.0", + "orientation" : "portrait", + "scale" : "2x" + }, + { + "extent" : "full-screen", + "idiom" : "iphone", + "subtype" : "1792h", + "filename" : "ScummVM-splash-1792x828.png", + "minimum-system-version" : "12.0", + "orientation" : "landscape", + "scale" : "2x" + }, + { + "extent" : "full-screen", + "idiom" : "iphone", + "subtype" : "2436h", + "filename" : "ScummVM-splash-1125x2436.png", + "minimum-system-version" : "11.0", + "orientation" : "portrait", + "scale" : "3x" + }, + { + "extent" : "full-screen", + "idiom" : "iphone", + "subtype" : "2436h", + "filename" : "ScummVM-splash-2436x1125.png", + "minimum-system-version" : "11.0", + "orientation" : "landscape", + "scale" : "3x" + }, + { + "extent" : "full-screen", + "idiom" : "iphone", "subtype" : "736h", "filename" : "ScummVM-splash-1242x2208.png", "minimum-system-version" : "8.0", diff --git a/dists/ios7/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-1125x2436.png b/dists/ios7/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-1125x2436.png Binary files differnew file mode 100644 index 0000000000..05c8f873d7 --- /dev/null +++ b/dists/ios7/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-1125x2436.png diff --git a/dists/ios7/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-1242x2208.png b/dists/ios7/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-1242x2208.png Binary files differindex f88f48d507..fb5c2e1589 100644 --- a/dists/ios7/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-1242x2208.png +++ b/dists/ios7/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-1242x2208.png diff --git a/dists/ios7/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-1242x2688.png b/dists/ios7/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-1242x2688.png Binary files differnew file mode 100644 index 0000000000..82ddb62b52 --- /dev/null +++ b/dists/ios7/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-1242x2688.png diff --git a/dists/ios7/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-1536x2048.png b/dists/ios7/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-1536x2048.png Binary files differindex ca9a2c173a..a71c06d6f3 100644 --- a/dists/ios7/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-1536x2048.png +++ b/dists/ios7/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-1536x2048.png diff --git a/dists/ios7/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-1792x828.png b/dists/ios7/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-1792x828.png Binary files differnew file mode 100644 index 0000000000..fcdb1e44f6 --- /dev/null +++ b/dists/ios7/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-1792x828.png diff --git a/dists/ios7/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-2048x1536.png b/dists/ios7/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-2048x1536.png Binary files differindex 85e661aa31..1439b1595b 100644 --- a/dists/ios7/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-2048x1536.png +++ b/dists/ios7/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-2048x1536.png diff --git a/dists/ios7/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-2208x1242.png b/dists/ios7/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-2208x1242.png Binary files differindex e013a1e605..4be9066e9c 100644 --- a/dists/ios7/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-2208x1242.png +++ b/dists/ios7/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-2208x1242.png diff --git a/dists/ios7/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-2436x1125.png b/dists/ios7/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-2436x1125.png Binary files differnew file mode 100644 index 0000000000..2673af269f --- /dev/null +++ b/dists/ios7/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-2436x1125.png diff --git a/dists/ios7/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-2688x1242.png b/dists/ios7/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-2688x1242.png Binary files differnew file mode 100644 index 0000000000..c6f086bc8c --- /dev/null +++ b/dists/ios7/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-2688x1242.png diff --git a/dists/ios7/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-828x1792.png b/dists/ios7/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-828x1792.png Binary files differnew file mode 100644 index 0000000000..9282deba25 --- /dev/null +++ b/dists/ios7/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-828x1792.png diff --git a/dists/ios7/Info.plist b/dists/ios7/Info.plist index 617c4993e9..ab408fdae6 100644 --- a/dists/ios7/Info.plist +++ b/dists/ios7/Info.plist @@ -24,6 +24,8 @@ <string>????</string> <key>CFBundleVersion</key> <string>2.1.0git</string> + <key>LSSupportsOpeningDocumentsInPlace</key> + <true/> <key>UIApplicationExitsOnSuspend</key> <false/> <key>UIDeviceFamily</key> |
