[Scummvm-git-logs] scummvm master -> db4ef7c46778a5147aa6ff8a2972beb7c5188372

sev- sev at scummvm.org
Wed Feb 22 22:04:33 CET 2017


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:
8a70c0c922 ANDROIDSDL: changed filename in asset file with scummvm-data for replacing old data-files
db4ef7c467 Merge pull request #909 from lubomyr/master


Commit: 8a70c0c9225e6aa85a93c30c3f59eb6473fcd90c
    https://github.com/scummvm/scummvm/commit/8a70c0c9225e6aa85a93c30c3f59eb6473fcd90c
Author: lubomyr (lubomyr31 at gmail.com)
Date: 2017-02-22T22:49:47+02:00

Commit Message:
ANDROIDSDL: changed filename in asset file with scummvm-data for replacing old data-files

Changed paths:
    backends/platform/androidsdl/androidsdl.mk
    dists/androidsdl/scummvm/AndroidAppSettings.cfg
    dists/androidsdl/scummvm/AndroidAppSettings.cfg.in


diff --git a/backends/platform/androidsdl/androidsdl.mk b/backends/platform/androidsdl/androidsdl.mk
index 1defb81..53c0d27 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 1c044fe..55300e6 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 78756b0..897389a 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)


Commit: db4ef7c46778a5147aa6ff8a2972beb7c5188372
    https://github.com/scummvm/scummvm/commit/db4ef7c46778a5147aa6ff8a2972beb7c5188372
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-02-22T22:04:29+01:00

Commit Message:
Merge pull request #909 from lubomyr/master

ANDROIDSDL: changed filename in assets file with scummvm-data for replace old data files

Changed paths:
    backends/platform/androidsdl/androidsdl.mk
    dists/androidsdl/scummvm/AndroidAppSettings.cfg
    dists/androidsdl/scummvm/AndroidAppSettings.cfg.in







More information about the Scummvm-git-logs mailing list