From 638dc113f8c05f121d50e68f68c4e86c130756a4 Mon Sep 17 00:00:00 2001
From: Vincent Bénony
Date: Fri, 4 Dec 2015 18:20:09 +0100
Subject: IOS: Create two targets for old iPhone (iOS <= 6) and new one (iOS >=
7)
The "iphone" backend is the support for the old iPhones.
The "ios7" backend is for the new iPhones.
---
dists/iphone/Default.png | Bin 0 -> 32558 bytes
.../AppIcon.appiconset/Contents.json | 80 -----------
.../AppIcon.appiconset/icon4-29.png | Bin 3084 -> 0 bytes
.../AppIcon.appiconset/icon4-29@2x.png | Bin 6829 -> 0 bytes
.../AppIcon.appiconset/icon4-29@3x.png | Bin 12228 -> 0 bytes
.../AppIcon.appiconset/icon4-40.png | Bin 4356 -> 0 bytes
.../AppIcon.appiconset/icon4-40@2x.png | Bin 10744 -> 0 bytes
.../AppIcon.appiconset/icon4-40@3x.png | Bin 18115 -> 0 bytes
.../AppIcon.appiconset/icon4-60@2x.png | Bin 18115 -> 0 bytes
.../AppIcon.appiconset/icon4-60@3x.png | Bin 33953 -> 0 bytes
.../AppIcon.appiconset/icon4-76.png | Bin 10147 -> 0 bytes
.../AppIcon.appiconset/icon4-76@2x.png | Bin 26351 -> 0 bytes
dists/iphone/Images.xcassets/Contents.json | 6 -
.../LaunchImage.launchimage/Contents.json | 147 ---------------------
.../ScummVM-splash-1024x768.png | Bin 239614 -> 0 bytes
.../ScummVM-splash-1536x2048.png | Bin 942974 -> 0 bytes
.../ScummVM-splash-2048x1536.png | Bin 1069512 -> 0 bytes
.../ScummVM-splash-640x1136-1.png | Bin 671669 -> 0 bytes
.../ScummVM-splash-768x1024.png | Bin 185340 -> 0 bytes
dists/iphone/Info.plist | 35 ++---
dists/iphone/Info.plist.in | 35 ++---
dists/iphone/icon-72.png | Bin 0 -> 9695 bytes
dists/iphone/icon.png | Bin 0 -> 4741 bytes
dists/iphone/icon4.png | Bin 0 -> 15849 bytes
24 files changed, 28 insertions(+), 275 deletions(-)
create mode 100644 dists/iphone/Default.png
delete mode 100644 dists/iphone/Images.xcassets/AppIcon.appiconset/Contents.json
delete mode 100644 dists/iphone/Images.xcassets/AppIcon.appiconset/icon4-29.png
delete mode 100644 dists/iphone/Images.xcassets/AppIcon.appiconset/icon4-29@2x.png
delete mode 100644 dists/iphone/Images.xcassets/AppIcon.appiconset/icon4-29@3x.png
delete mode 100644 dists/iphone/Images.xcassets/AppIcon.appiconset/icon4-40.png
delete mode 100644 dists/iphone/Images.xcassets/AppIcon.appiconset/icon4-40@2x.png
delete mode 100644 dists/iphone/Images.xcassets/AppIcon.appiconset/icon4-40@3x.png
delete mode 100644 dists/iphone/Images.xcassets/AppIcon.appiconset/icon4-60@2x.png
delete mode 100644 dists/iphone/Images.xcassets/AppIcon.appiconset/icon4-60@3x.png
delete mode 100644 dists/iphone/Images.xcassets/AppIcon.appiconset/icon4-76.png
delete mode 100644 dists/iphone/Images.xcassets/AppIcon.appiconset/icon4-76@2x.png
delete mode 100644 dists/iphone/Images.xcassets/Contents.json
delete mode 100644 dists/iphone/Images.xcassets/LaunchImage.launchimage/Contents.json
delete mode 100644 dists/iphone/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-1024x768.png
delete mode 100644 dists/iphone/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-1536x2048.png
delete mode 100644 dists/iphone/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-2048x1536.png
delete mode 100644 dists/iphone/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-640x1136-1.png
delete mode 100644 dists/iphone/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-768x1024.png
create mode 100644 dists/iphone/icon-72.png
create mode 100644 dists/iphone/icon.png
create mode 100644 dists/iphone/icon4.png
(limited to 'dists/iphone')
diff --git a/dists/iphone/Default.png b/dists/iphone/Default.png
new file mode 100644
index 0000000000..7570bc27d1
Binary files /dev/null and b/dists/iphone/Default.png differ
diff --git a/dists/iphone/Images.xcassets/AppIcon.appiconset/Contents.json b/dists/iphone/Images.xcassets/AppIcon.appiconset/Contents.json
deleted file mode 100644
index 607a2a141a..0000000000
--- a/dists/iphone/Images.xcassets/AppIcon.appiconset/Contents.json
+++ /dev/null
@@ -1,80 +0,0 @@
-{
- "images" : [
- {
- "size" : "29x29",
- "idiom" : "iphone",
- "filename" : "icon4-29@2x.png",
- "scale" : "2x"
- },
- {
- "size" : "29x29",
- "idiom" : "iphone",
- "filename" : "icon4-29@3x.png",
- "scale" : "3x"
- },
- {
- "size" : "40x40",
- "idiom" : "iphone",
- "filename" : "icon4-40@2x.png",
- "scale" : "2x"
- },
- {
- "size" : "40x40",
- "idiom" : "iphone",
- "filename" : "icon4-40@3x.png",
- "scale" : "3x"
- },
- {
- "size" : "60x60",
- "idiom" : "iphone",
- "filename" : "icon4-60@2x.png",
- "scale" : "2x"
- },
- {
- "size" : "60x60",
- "idiom" : "iphone",
- "filename" : "icon4-60@3x.png",
- "scale" : "3x"
- },
- {
- "size" : "29x29",
- "idiom" : "ipad",
- "filename" : "icon4-29.png",
- "scale" : "1x"
- },
- {
- "size" : "29x29",
- "idiom" : "ipad",
- "filename" : "icon4-29@2x.png",
- "scale" : "2x"
- },
- {
- "size" : "40x40",
- "idiom" : "ipad",
- "filename" : "icon4-40.png",
- "scale" : "1x"
- },
- {
- "size" : "40x40",
- "idiom" : "ipad",
- "filename" : "icon4-40@2x.png",
- "scale" : "2x"
- },
- {
- "size" : "76x76",
- "idiom" : "ipad",
- "filename" : "icon4-76.png",
- "scale" : "1x"
- },
- {
- "size" : "76x76",
- "idiom" : "ipad",
- "filename" : "icon4-76@2x.png",
- "scale" : "2x"
- }
- ],
- "info" : {
- "version" : 1,
- "author" : "xcode"
- }
-}
\ No newline at end of file
diff --git a/dists/iphone/Images.xcassets/AppIcon.appiconset/icon4-29.png b/dists/iphone/Images.xcassets/AppIcon.appiconset/icon4-29.png
deleted file mode 100644
index 9b89d07046..0000000000
Binary files a/dists/iphone/Images.xcassets/AppIcon.appiconset/icon4-29.png and /dev/null differ
diff --git a/dists/iphone/Images.xcassets/AppIcon.appiconset/icon4-29@2x.png b/dists/iphone/Images.xcassets/AppIcon.appiconset/icon4-29@2x.png
deleted file mode 100644
index 0de0984ed7..0000000000
Binary files a/dists/iphone/Images.xcassets/AppIcon.appiconset/icon4-29@2x.png and /dev/null differ
diff --git a/dists/iphone/Images.xcassets/AppIcon.appiconset/icon4-29@3x.png b/dists/iphone/Images.xcassets/AppIcon.appiconset/icon4-29@3x.png
deleted file mode 100644
index db6089dcf6..0000000000
Binary files a/dists/iphone/Images.xcassets/AppIcon.appiconset/icon4-29@3x.png and /dev/null differ
diff --git a/dists/iphone/Images.xcassets/AppIcon.appiconset/icon4-40.png b/dists/iphone/Images.xcassets/AppIcon.appiconset/icon4-40.png
deleted file mode 100644
index 9a7575b404..0000000000
Binary files a/dists/iphone/Images.xcassets/AppIcon.appiconset/icon4-40.png and /dev/null differ
diff --git a/dists/iphone/Images.xcassets/AppIcon.appiconset/icon4-40@2x.png b/dists/iphone/Images.xcassets/AppIcon.appiconset/icon4-40@2x.png
deleted file mode 100644
index 5cd982d0e1..0000000000
Binary files a/dists/iphone/Images.xcassets/AppIcon.appiconset/icon4-40@2x.png and /dev/null differ
diff --git a/dists/iphone/Images.xcassets/AppIcon.appiconset/icon4-40@3x.png b/dists/iphone/Images.xcassets/AppIcon.appiconset/icon4-40@3x.png
deleted file mode 100644
index 22580b0ac6..0000000000
Binary files a/dists/iphone/Images.xcassets/AppIcon.appiconset/icon4-40@3x.png and /dev/null differ
diff --git a/dists/iphone/Images.xcassets/AppIcon.appiconset/icon4-60@2x.png b/dists/iphone/Images.xcassets/AppIcon.appiconset/icon4-60@2x.png
deleted file mode 100644
index 22580b0ac6..0000000000
Binary files a/dists/iphone/Images.xcassets/AppIcon.appiconset/icon4-60@2x.png and /dev/null differ
diff --git a/dists/iphone/Images.xcassets/AppIcon.appiconset/icon4-60@3x.png b/dists/iphone/Images.xcassets/AppIcon.appiconset/icon4-60@3x.png
deleted file mode 100644
index c5f39976bb..0000000000
Binary files a/dists/iphone/Images.xcassets/AppIcon.appiconset/icon4-60@3x.png and /dev/null differ
diff --git a/dists/iphone/Images.xcassets/AppIcon.appiconset/icon4-76.png b/dists/iphone/Images.xcassets/AppIcon.appiconset/icon4-76.png
deleted file mode 100644
index 0609594553..0000000000
Binary files a/dists/iphone/Images.xcassets/AppIcon.appiconset/icon4-76.png and /dev/null differ
diff --git a/dists/iphone/Images.xcassets/AppIcon.appiconset/icon4-76@2x.png b/dists/iphone/Images.xcassets/AppIcon.appiconset/icon4-76@2x.png
deleted file mode 100644
index 7bc1ae1de1..0000000000
Binary files a/dists/iphone/Images.xcassets/AppIcon.appiconset/icon4-76@2x.png and /dev/null differ
diff --git a/dists/iphone/Images.xcassets/Contents.json b/dists/iphone/Images.xcassets/Contents.json
deleted file mode 100644
index da4a164c91..0000000000
--- a/dists/iphone/Images.xcassets/Contents.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "info" : {
- "version" : 1,
- "author" : "xcode"
- }
-}
\ No newline at end of file
diff --git a/dists/iphone/Images.xcassets/LaunchImage.launchimage/Contents.json b/dists/iphone/Images.xcassets/LaunchImage.launchimage/Contents.json
deleted file mode 100644
index 139f4e7756..0000000000
--- a/dists/iphone/Images.xcassets/LaunchImage.launchimage/Contents.json
+++ /dev/null
@@ -1,147 +0,0 @@
-{
- "images" : [
- {
- "orientation" : "portrait",
- "idiom" : "iphone",
- "extent" : "full-screen",
- "minimum-system-version" : "8.0",
- "subtype" : "736h",
- "scale" : "3x"
- },
- {
- "orientation" : "landscape",
- "idiom" : "iphone",
- "extent" : "full-screen",
- "minimum-system-version" : "8.0",
- "subtype" : "736h",
- "scale" : "3x"
- },
- {
- "orientation" : "portrait",
- "idiom" : "iphone",
- "extent" : "full-screen",
- "minimum-system-version" : "8.0",
- "subtype" : "667h",
- "scale" : "2x"
- },
- {
- "orientation" : "portrait",
- "idiom" : "iphone",
- "extent" : "full-screen",
- "minimum-system-version" : "7.0",
- "scale" : "2x"
- },
- {
- "extent" : "full-screen",
- "idiom" : "iphone",
- "subtype" : "retina4",
- "filename" : "ScummVM-splash-640x1136-1.png",
- "minimum-system-version" : "7.0",
- "orientation" : "portrait",
- "scale" : "2x"
- },
- {
- "orientation" : "portrait",
- "idiom" : "ipad",
- "filename" : "ScummVM-splash-768x1024.png",
- "extent" : "full-screen",
- "minimum-system-version" : "7.0",
- "scale" : "1x"
- },
- {
- "orientation" : "landscape",
- "idiom" : "ipad",
- "filename" : "ScummVM-splash-1024x768.png",
- "extent" : "full-screen",
- "minimum-system-version" : "7.0",
- "scale" : "1x"
- },
- {
- "orientation" : "portrait",
- "idiom" : "ipad",
- "filename" : "ScummVM-splash-1536x2048.png",
- "extent" : "full-screen",
- "minimum-system-version" : "7.0",
- "scale" : "2x"
- },
- {
- "orientation" : "landscape",
- "idiom" : "ipad",
- "filename" : "ScummVM-splash-2048x1536.png",
- "extent" : "full-screen",
- "minimum-system-version" : "7.0",
- "scale" : "2x"
- },
- {
- "orientation" : "portrait",
- "idiom" : "iphone",
- "extent" : "full-screen",
- "scale" : "1x"
- },
- {
- "orientation" : "portrait",
- "idiom" : "iphone",
- "extent" : "full-screen",
- "scale" : "2x"
- },
- {
- "orientation" : "portrait",
- "idiom" : "iphone",
- "extent" : "full-screen",
- "subtype" : "retina4",
- "scale" : "2x"
- },
- {
- "orientation" : "portrait",
- "idiom" : "ipad",
- "extent" : "to-status-bar",
- "scale" : "1x"
- },
- {
- "orientation" : "portrait",
- "idiom" : "ipad",
- "extent" : "full-screen",
- "scale" : "1x"
- },
- {
- "orientation" : "landscape",
- "idiom" : "ipad",
- "extent" : "to-status-bar",
- "scale" : "1x"
- },
- {
- "orientation" : "landscape",
- "idiom" : "ipad",
- "extent" : "full-screen",
- "scale" : "1x"
- },
- {
- "orientation" : "portrait",
- "idiom" : "ipad",
- "extent" : "to-status-bar",
- "scale" : "2x"
- },
- {
- "orientation" : "portrait",
- "idiom" : "ipad",
- "extent" : "full-screen",
- "scale" : "2x"
- },
- {
- "orientation" : "landscape",
- "idiom" : "ipad",
- "extent" : "to-status-bar",
- "scale" : "2x"
- },
- {
- "orientation" : "landscape",
- "idiom" : "ipad",
- "extent" : "full-screen",
- "scale" : "2x"
- }
- ],
- "info" : {
- "version" : 1,
- "author" : "xcode"
- }
-}
\ No newline at end of file
diff --git a/dists/iphone/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-1024x768.png b/dists/iphone/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-1024x768.png
deleted file mode 100644
index 6fb6c9bf4b..0000000000
Binary files a/dists/iphone/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-1024x768.png and /dev/null differ
diff --git a/dists/iphone/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-1536x2048.png b/dists/iphone/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-1536x2048.png
deleted file mode 100644
index 8d6e588226..0000000000
Binary files a/dists/iphone/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-1536x2048.png and /dev/null differ
diff --git a/dists/iphone/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-2048x1536.png b/dists/iphone/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-2048x1536.png
deleted file mode 100644
index 988122bce8..0000000000
Binary files a/dists/iphone/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-2048x1536.png and /dev/null differ
diff --git a/dists/iphone/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-640x1136-1.png b/dists/iphone/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-640x1136-1.png
deleted file mode 100644
index 91641cf91f..0000000000
Binary files a/dists/iphone/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-640x1136-1.png and /dev/null differ
diff --git a/dists/iphone/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-768x1024.png b/dists/iphone/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-768x1024.png
deleted file mode 100644
index 6a33b63110..0000000000
Binary files a/dists/iphone/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-768x1024.png and /dev/null differ
diff --git a/dists/iphone/Info.plist b/dists/iphone/Info.plist
index 3735919321..d630801504 100644
--- a/dists/iphone/Info.plist
+++ b/dists/iphone/Info.plist
@@ -6,14 +6,8 @@
en
CFBundleExecutable
ScummVM
- CFBundleIcons
-
- CFBundleIcons~ipad
-
- UILaunchImages
-
CFBundleIdentifier
- $(PRODUCT_BUNDLE_IDENTIFIER)
+ org.scummvm.scummvm
CFBundleInfoDictionaryVersion
6.0
CFBundleName
@@ -26,27 +20,26 @@
????
CFBundleVersion
1.8.0git
- UIApplicationExitsOnSuspend
-
- UIFileSharingEnabled
-
+ CFBundleIconFile
+ icon.png
+ CFBundleIconFiles
+
+ icon.png
+ icon-72.png
+ icon4.png
+
UIPrerenderedIcon
- UIRequiresFullScreen
-
- UIStatusBarHidden
-
- UISupportedInterfaceOrientations
+ UIDeviceFamily
- UIInterfaceOrientationLandscapeLeft
- UIInterfaceOrientationLandscapeRight
- UIInterfaceOrientationPortrait
+ 1
+ 2
- UISupportedInterfaceOrientations~ipad
+ UISupportedInterfaceOrientations
+ UIInterfaceOrientationPortrait
UIInterfaceOrientationLandscapeLeft
UIInterfaceOrientationLandscapeRight
- UIInterfaceOrientationPortrait
diff --git a/dists/iphone/Info.plist.in b/dists/iphone/Info.plist.in
index c179ffed8f..2bcdd15a03 100644
--- a/dists/iphone/Info.plist.in
+++ b/dists/iphone/Info.plist.in
@@ -6,14 +6,8 @@
en
CFBundleExecutable
ScummVM
- CFBundleIcons
-
- CFBundleIcons~ipad
-
- UILaunchImages
-
CFBundleIdentifier
- $(PRODUCT_BUNDLE_IDENTIFIER)
+ org.scummvm.scummvm
CFBundleInfoDictionaryVersion
6.0
CFBundleName
@@ -26,27 +20,26 @@
????
CFBundleVersion
@VERSION@
- UIApplicationExitsOnSuspend
-
- UIFileSharingEnabled
-
+ CFBundleIconFile
+ icon.png
+ CFBundleIconFiles
+
+ icon.png
+ icon-72.png
+ icon4.png
+
UIPrerenderedIcon
- UIRequiresFullScreen
-
- UIStatusBarHidden
-
- UISupportedInterfaceOrientations
+ UIDeviceFamily
- UIInterfaceOrientationLandscapeLeft
- UIInterfaceOrientationLandscapeRight
- UIInterfaceOrientationPortrait
+ 1
+ 2
- UISupportedInterfaceOrientations~ipad
+ UISupportedInterfaceOrientations
+ UIInterfaceOrientationPortrait
UIInterfaceOrientationLandscapeLeft
UIInterfaceOrientationLandscapeRight
- UIInterfaceOrientationPortrait
diff --git a/dists/iphone/icon-72.png b/dists/iphone/icon-72.png
new file mode 100644
index 0000000000..9b424b4018
Binary files /dev/null and b/dists/iphone/icon-72.png differ
diff --git a/dists/iphone/icon.png b/dists/iphone/icon.png
new file mode 100644
index 0000000000..3c96b0dee4
Binary files /dev/null and b/dists/iphone/icon.png differ
diff --git a/dists/iphone/icon4.png b/dists/iphone/icon4.png
new file mode 100644
index 0000000000..5abe16ed51
Binary files /dev/null and b/dists/iphone/icon4.png differ
--
cgit v1.2.3