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.

24 files changed, 28 insertions, 275 deletions

diff --git a/dists/iphone/Default.png b/dists/iphone/Default.png
new file mode 100644
index 0000000000..7570bc27d1
--- /dev/null
+++ b/dists/iphone/Default.png
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
--- a/dists/iphone/Images.xcassets/AppIcon.appiconset/icon4-29.png
+++ /dev/null
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
--- a/dists/iphone/Images.xcassets/AppIcon.appiconset/icon4-29@2x.png
+++ /dev/null
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
--- a/dists/iphone/Images.xcassets/AppIcon.appiconset/icon4-29@3x.png
+++ /dev/null
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
--- a/dists/iphone/Images.xcassets/AppIcon.appiconset/icon4-40.png
+++ /dev/null
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
--- a/dists/iphone/Images.xcassets/AppIcon.appiconset/icon4-40@2x.png
+++ /dev/null
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
--- a/dists/iphone/Images.xcassets/AppIcon.appiconset/icon4-40@3x.png
+++ /dev/null
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
--- a/dists/iphone/Images.xcassets/AppIcon.appiconset/icon4-60@2x.png
+++ /dev/null
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
--- a/dists/iphone/Images.xcassets/AppIcon.appiconset/icon4-60@3x.png
+++ /dev/null
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
--- a/dists/iphone/Images.xcassets/AppIcon.appiconset/icon4-76.png
+++ /dev/null
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
--- a/dists/iphone/Images.xcassets/AppIcon.appiconset/icon4-76@2x.png
+++ /dev/null
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
--- a/dists/iphone/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-1024x768.png
+++ /dev/null
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
--- a/dists/iphone/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-1536x2048.png
+++ /dev/null
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
--- a/dists/iphone/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-2048x1536.png
+++ /dev/null
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
--- a/dists/iphone/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-640x1136-1.png
+++ /dev/null
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
--- a/dists/iphone/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-768x1024.png
+++ /dev/null
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 @@
 	<string>en</string>
 	<key>CFBundleExecutable</key>
 	<string>ScummVM</string>
-	<key>CFBundleIcons</key>
-	<dict/>
-	<key>CFBundleIcons~ipad</key>
-	<dict/>
-	<key>UILaunchImages</key>
-	<array/>
 	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<string>org.scummvm.scummvm</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
@@ -26,27 +20,26 @@
 	<string>????</string>
 	<key>CFBundleVersion</key>
 	<string>1.8.0git</string>
-	<key>UIApplicationExitsOnSuspend</key>
-	<true/>
-	<key>UIFileSharingEnabled</key>
-	<true/>
+	<key>CFBundleIconFile</key>
+	<string>icon.png</string>
+	<key>CFBundleIconFiles</key>
+	<array>
+		<string>icon.png</string>
+		<string>icon-72.png</string>
+		<string>icon4.png</string>
+	</array>
 	<key>UIPrerenderedIcon</key>
 	<true/>
-	<key>UIRequiresFullScreen</key>
-	<true/>
-	<key>UIStatusBarHidden</key>
-	<true/>
-	<key>UISupportedInterfaceOrientations</key>
+	<key>UIDeviceFamily</key>
 	<array>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-		<string>UIInterfaceOrientationPortrait</string>
+		<integer>1</integer>
+		<integer>2</integer>
 	</array>
-	<key>UISupportedInterfaceOrientations~ipad</key>
+	<key>UISupportedInterfaceOrientations</key>
 	<array>
+		<string>UIInterfaceOrientationPortrait</string>
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
-		<string>UIInterfaceOrientationPortrait</string>
 	</array>
 </dict>
 </plist>
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 @@
 	<string>en</string>
 	<key>CFBundleExecutable</key>
 	<string>ScummVM</string>
-	<key>CFBundleIcons</key>
-	<dict/>
-	<key>CFBundleIcons~ipad</key>
-	<dict/>
-	<key>UILaunchImages</key>
-	<array/>
 	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<string>org.scummvm.scummvm</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
@@ -26,27 +20,26 @@
 	<string>????</string>
 	<key>CFBundleVersion</key>
 	<string>@VERSION@</string>
-	<key>UIApplicationExitsOnSuspend</key>
-	<true/>
-	<key>UIFileSharingEnabled</key>
-	<true/>
+	<key>CFBundleIconFile</key>
+	<string>icon.png</string>
+	<key>CFBundleIconFiles</key>
+	<array>
+		<string>icon.png</string>
+		<string>icon-72.png</string>
+		<string>icon4.png</string>
+	</array>
 	<key>UIPrerenderedIcon</key>
 	<true/>
-	<key>UIRequiresFullScreen</key>
-	<true/>
-	<key>UIStatusBarHidden</key>
-	<true/>
-	<key>UISupportedInterfaceOrientations</key>
+	<key>UIDeviceFamily</key>
 	<array>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-		<string>UIInterfaceOrientationPortrait</string>
+		<integer>1</integer>
+		<integer>2</integer>
 	</array>
-	<key>UISupportedInterfaceOrientations~ipad</key>
+	<key>UISupportedInterfaceOrientations</key>
 	<array>
+		<string>UIInterfaceOrientationPortrait</string>
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
-		<string>UIInterfaceOrientationPortrait</string>
 	</array>
 </dict>
 </plist>
diff --git a/dists/iphone/icon-72.png b/dists/iphone/icon-72.png
new file mode 100644
index 0000000000..9b424b4018
--- /dev/null
+++ b/dists/iphone/icon-72.png
diff --git a/dists/iphone/icon.png b/dists/iphone/icon.png
new file mode 100644
index 0000000000..3c96b0dee4
--- /dev/null
+++ b/dists/iphone/icon.png
diff --git a/dists/iphone/icon4.png b/dists/iphone/icon4.png
new file mode 100644
index 0000000000..5abe16ed51
--- /dev/null
+++ b/dists/iphone/icon4.png