[Scummvm-git-logs] scummvm branch-2-2 -> 196451600076ac6a435cabd6098c859e13791cd2
criezy
criezy at scummvm.org
Sun Sep 6 22:44:18 UTC 2020
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
51c620ba78 IOS: Add LaunchScreen.storyboard to support full screen on iPad Pro
1964516000 IOS: Remove UILaunchStoryboardName from Info.plist in ios7bundle target
Commit: 51c620ba789f4749e309f6c4275fc6ef9ec0626b
https://github.com/scummvm/scummvm/commit/51c620ba789f4749e309f6c4275fc6ef9ec0626b
Author: Andrew Martin (andrew at andrew-m.co.uk)
Date: 2020-09-06T23:43:08+01:00
Commit Message:
IOS: Add LaunchScreen.storyboard to support full screen on iPad Pro
Changed paths:
A dists/ios7/Images.xcassets/ScummVM.imageset/Contents.json
A dists/ios7/Images.xcassets/ScummVM.imageset/ScummVM.png
A dists/ios7/LaunchScreen_ios.storyboard
devtools/create_project/xcode.cpp
dists/ios7/Info.plist
dists/ios7/Info.plist.in
diff --git a/devtools/create_project/xcode.cpp b/devtools/create_project/xcode.cpp
index 368c5d250d..3ee02a62b6 100644
--- a/devtools/create_project/xcode.cpp
+++ b/devtools/create_project/xcode.cpp
@@ -809,6 +809,7 @@ XcodeProvider::ValueList& XcodeProvider::getResourceFiles() const {
files.push_back("dists/engine-data/wintermute.zip");
files.push_back("dists/engine-data/macventure.dat");
files.push_back("dists/engine-data/xeen.ccs");
+ files.push_back("dists/ios7/LaunchScreen_ios.storyboard");
files.push_back("dists/pred.dic");
files.push_back("dists/networking/wwwroot.zip");
files.push_back("icons/scummvm.icns");
diff --git a/dists/ios7/Images.xcassets/ScummVM.imageset/Contents.json b/dists/ios7/Images.xcassets/ScummVM.imageset/Contents.json
new file mode 100644
index 0000000000..f54b00fc05
--- /dev/null
+++ b/dists/ios7/Images.xcassets/ScummVM.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+ "images" : [
+ {
+ "filename" : "ScummVM.png",
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/dists/ios7/Images.xcassets/ScummVM.imageset/ScummVM.png b/dists/ios7/Images.xcassets/ScummVM.imageset/ScummVM.png
new file mode 100644
index 0000000000..3514798413
Binary files /dev/null and b/dists/ios7/Images.xcassets/ScummVM.imageset/ScummVM.png differ
diff --git a/dists/ios7/Info.plist b/dists/ios7/Info.plist
index 12d18d1401..bdcd15e30a 100644
--- a/dists/ios7/Info.plist
+++ b/dists/ios7/Info.plist
@@ -37,6 +37,8 @@
<true/>
<key>UILaunchImages</key>
<array/>
+ <key>UILaunchStoryboardName</key>
+ <string>LaunchScreen_ios</string>
<key>UIPrerenderedIcon</key>
<true/>
<key>UIRequiresFullScreen</key>
diff --git a/dists/ios7/Info.plist.in b/dists/ios7/Info.plist.in
index 7c5edfdbea..161893071b 100644
--- a/dists/ios7/Info.plist.in
+++ b/dists/ios7/Info.plist.in
@@ -37,6 +37,8 @@
<true/>
<key>UILaunchImages</key>
<array/>
+ <key>UILaunchStoryboardName</key>
+ <string>LaunchScreen_ios</string>
<key>UIPrerenderedIcon</key>
<true/>
<key>UIRequiresFullScreen</key>
diff --git a/dists/ios7/LaunchScreen_ios.storyboard b/dists/ios7/LaunchScreen_ios.storyboard
new file mode 100644
index 0000000000..e87ba96a2c
--- /dev/null
+++ b/dists/ios7/LaunchScreen_ios.storyboard
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="16097.2" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+ <device id="retina6_1" orientation="portrait" appearance="light"/>
+ <dependencies>
+ <deployment version="2048" identifier="iOS"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
+ <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+ </dependencies>
+ <scenes>
+ <!--View Controller-->
+ <scene sceneID="EHf-IW-A2E">
+ <objects>
+ <viewController id="01J-lp-oVM" sceneMemberID="viewController">
+ <layoutGuides>
+ <viewControllerLayoutGuide type="top" id="kfR-vv-sCd"/>
+ <viewControllerLayoutGuide type="bottom" id="KcF-ab-V6r"/>
+ </layoutGuides>
+ <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
+ <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <subviews>
+ <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" image="ScummVM" translatesAutoresizingMaskIntoConstraints="NO" id="Ril-gi-m8R">
+ <rect key="frame" x="53.5" y="405.5" width="307" height="85"/>
+ </imageView>
+ </subviews>
+ <color key="backgroundColor" red="0.806841433" green="0.40681111809999998" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ <constraints>
+ <constraint firstItem="Ril-gi-m8R" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="GYN-Pc-5zR"/>
+ <constraint firstItem="Ril-gi-m8R" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="tDr-MD-7QO"/>
+ </constraints>
+ </view>
+ </viewController>
+ <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
+ </objects>
+ <point key="canvasLocation" x="49.275362318840585" y="372.32142857142856"/>
+ </scene>
+ </scenes>
+ <resources>
+ <image name="ScummVM" width="307" height="85"/>
+ </resources>
+</document>
Commit: 196451600076ac6a435cabd6098c859e13791cd2
https://github.com/scummvm/scummvm/commit/196451600076ac6a435cabd6098c859e13791cd2
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2020-09-06T23:43:16+01:00
Commit Message:
IOS: Remove UILaunchStoryboardName from Info.plist in ios7bundle target
Currently only Xcode knows how to compile storyboard files. But if
we keep the UILaunchStoryboardName in the Info.plist this causes
a black screen on launch, and removing it allows getting the
UILaunchImages instead.
Changed paths:
ports.mk
diff --git a/ports.mk b/ports.mk
index 420b3082fa..b56279940a 100644
--- a/ports.mk
+++ b/ports.mk
@@ -269,6 +269,7 @@ ios7bundle: iphone
s==0 {print $$0}\
s > 0 { s-- }' $(srcdir)/dists/ios7/Info.plist >$(bundle_name)/Info.plist
sed -i'' -e 's/$$(PRODUCT_BUNDLE_IDENTIFIER)/org.scummvm.scummvm/' $(bundle_name)/Info.plist
+ sed -i'' -e '/UILaunchStoryboardName/{N;d;}' $(bundle_name)/Info.plist
cp $(DIST_FILES_DOCS) $(bundle_name)/
cp $(DIST_FILES_THEMES) $(bundle_name)/
ifdef DIST_FILES_NETWORKING
More information about the Scummvm-git-logs
mailing list