aboutsummaryrefslogtreecommitdiff
path: root/dists
diff options
context:
space:
mode:
authorEugene Sandulenko2016-08-30 13:54:12 +0200
committerGitHub2016-08-30 13:54:12 +0200
commitbfbfbd3e1a8397cc3b1c9eaff6c7754abe3ddc3d (patch)
tree68851bdc99b78b4b1902944c1df3c3ee5d4f4489 /dists
parent7df744c291e5fcf5dc7afd3b21189c2c56810f8e (diff)
parent368f664c813075f8b8cb2c572dce65f60128eda4 (diff)
downloadscummvm-rg350-bfbfbd3e1a8397cc3b1c9eaff6c7754abe3ddc3d.tar.gz
scummvm-rg350-bfbfbd3e1a8397cc3b1c9eaff6c7754abe3ddc3d.tar.bz2
scummvm-rg350-bfbfbd3e1a8397cc3b1c9eaff6c7754abe3ddc3d.zip
Merge pull request #788 from Tkachov/cloud
ALL: Add Cloud storage support
Diffstat (limited to 'dists')
-rw-r--r--dists/android/AndroidManifest.xml2
-rw-r--r--dists/android/AndroidManifest.xml.in2
-rw-r--r--dists/cloudicon.pngbin0 -> 1242 bytes
-rw-r--r--dists/cloudicon_disabled.pngbin0 -> 1331 bytes
-rw-r--r--dists/scummvm.rc3
5 files changed, 7 insertions, 0 deletions
diff --git a/dists/android/AndroidManifest.xml b/dists/android/AndroidManifest.xml
index c091039266..64870a459b 100644
--- a/dists/android/AndroidManifest.xml
+++ b/dists/android/AndroidManifest.xml
@@ -40,6 +40,8 @@
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+ <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" android:required="true"/>
+
<uses-feature android:name="android.hardware.screen.landscape"
android:required="false" />
diff --git a/dists/android/AndroidManifest.xml.in b/dists/android/AndroidManifest.xml.in
index 7eaece9d1f..9601425c74 100644
--- a/dists/android/AndroidManifest.xml.in
+++ b/dists/android/AndroidManifest.xml.in
@@ -40,6 +40,8 @@
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+ <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" android:required="true"/>
+
<uses-feature android:name="android.hardware.screen.landscape"
android:required="false" />
diff --git a/dists/cloudicon.png b/dists/cloudicon.png
new file mode 100644
index 0000000000..21373aea1a
--- /dev/null
+++ b/dists/cloudicon.png
Binary files differ
diff --git a/dists/cloudicon_disabled.png b/dists/cloudicon_disabled.png
new file mode 100644
index 0000000000..27c9600b0a
--- /dev/null
+++ b/dists/cloudicon_disabled.png
Binary files differ
diff --git a/dists/scummvm.rc b/dists/scummvm.rc
index 873feaa419..00d71ef717 100644
--- a/dists/scummvm.rc
+++ b/dists/scummvm.rc
@@ -19,6 +19,9 @@ scummmodern.zip FILE "gui/themes/scummmodern.zip"
#ifdef USE_TRANSLATION
translations.dat FILE "gui/themes/translations.dat"
#endif
+#ifdef USE_SDL_NET
+wwwroot.zip FILE "backends/networking/wwwroot.zip"
+#endif
#if ENABLE_ACCESS == STATIC_PLUGIN
access.dat FILE "dists/engine-data/access.dat"