diff options
author | Eugene Sandulenko | 2017-02-22 22:04:29 +0100 |
---|---|---|
committer | GitHub | 2017-02-22 22:04:29 +0100 |
commit | db4ef7c46778a5147aa6ff8a2972beb7c5188372 (patch) | |
tree | a0ad921b7e4442ea80f667abe938c1f281931f4e | |
parent | 842cda6f3268f83b4e6306b8fb5e8226bf134513 (diff) | |
parent | 8a70c0c9225e6aa85a93c30c3f59eb6473fcd90c (diff) | |
download | scummvm-rg350-db4ef7c46778a5147aa6ff8a2972beb7c5188372.tar.gz scummvm-rg350-db4ef7c46778a5147aa6ff8a2972beb7c5188372.tar.bz2 scummvm-rg350-db4ef7c46778a5147aa6ff8a2972beb7c5188372.zip |
Merge pull request #909 from lubomyr/master
ANDROIDSDL: changed filename in assets file with scummvm-data for replace old data files
-rw-r--r-- | backends/platform/androidsdl/androidsdl.mk | 6 | ||||
-rw-r--r-- | dists/androidsdl/scummvm/AndroidAppSettings.cfg | 2 | ||||
-rw-r--r-- | dists/androidsdl/scummvm/AndroidAppSettings.cfg.in | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/backends/platform/androidsdl/androidsdl.mk b/backends/platform/androidsdl/androidsdl.mk index 1defb81b97..53c0d27666 100644 --- a/backends/platform/androidsdl/androidsdl.mk +++ b/backends/platform/androidsdl/androidsdl.mk @@ -4,8 +4,8 @@ androidsdl: $(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) release $(INSTALL) -c -m 644 $(DIST_FILES_DOCS) release $(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip release - zip -j scummvm190-git-appdata.zip release/* - split -d -b 1000000 scummvm190-git-appdata.zip scummvm190-git-appdata.zip0 - $(RM) -r scummvm190-git-appdata.zip + zip -j scummvm_1_10_0-git-appdata.zip release/* + split -d -b 1000000 scummvm_1_10_0-git-appdata.zip scummvm_1_10_0-git-appdata.zip0 + $(RM) -r scummvm_1_10_0-git-appdata.zip .PHONY: androidsdl diff --git a/dists/androidsdl/scummvm/AndroidAppSettings.cfg b/dists/androidsdl/scummvm/AndroidAppSettings.cfg index 1c044fef3e..55300e6edd 100644 --- a/dists/androidsdl/scummvm/AndroidAppSettings.cfg +++ b/dists/androidsdl/scummvm/AndroidAppSettings.cfg @@ -23,7 +23,7 @@ InhibitSuspend=y # If the URL does not contain 'http://' it is treated as file from 'project/jni/application/src/AndroidData' dir - # these files are put inside .apk package by build system # Also please avoid 'https://' URLs, many Android devices do not have trust certificates and will fail to connect to SF.net over HTTPS -AppDataDownloadUrl="!!App data|scummvm190-git-appdata.zip" +AppDataDownloadUrl="!!App data|scummvm_1_10_0-git-appdata.zip" # Video color depth - 16 BPP is the fastest and supported for all modes, 24 bpp is supported only # with SwVideoMode=y, SDL_OPENGL mode supports everything. (16)/(24)/(32) diff --git a/dists/androidsdl/scummvm/AndroidAppSettings.cfg.in b/dists/androidsdl/scummvm/AndroidAppSettings.cfg.in index 78756b0da6..897389a36f 100644 --- a/dists/androidsdl/scummvm/AndroidAppSettings.cfg.in +++ b/dists/androidsdl/scummvm/AndroidAppSettings.cfg.in @@ -23,7 +23,7 @@ InhibitSuspend=y # If the URL does not contain 'http://' it is treated as file from 'project/jni/application/src/AndroidData' dir - # these files are put inside .apk package by build system # Also please avoid 'https://' URLs, many Android devices do not have trust certificates and will fail to connect to SF.net over HTTPS -AppDataDownloadUrl="!!App data|scummvm190-git-appdata.zip" +AppDataDownloadUrl="!!App data|scummvm_1_10_0-git-appdata.zip" # Video color depth - 16 BPP is the fastest and supported for all modes, 24 bpp is supported only # with SwVideoMode=y, SDL_OPENGL mode supports everything. (16)/(24)/(32) |