ANDROIDSDL: Update port settings

rsn8887 · Oct 10, 2016 · be61f28 · be61f28
1 parent 9407d78
commit be61f28
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/backends/platform/androidsdl/androidsdl-main.cpp b/backends/platform/androidsdl/androidsdl-main.cpp
@@ -20,11 +20,16 @@
  *
  */
 
+#define FORBIDDEN_SYMBOL_EXCEPTION_system
+
 #include "backends/platform/androidsdl/androidsdl-sdl.h"
 #include "base/main.h"
 
 int main(int argc, char *argv[]) {
 
+	// Copy over config file from previous version of ScummVM if applicable
+	system("ls $DATADIR/.config/scummvm/scummvm.ini || (mkdir -p $DATADIR/.config/scummvm && cp $APPDIR/scummvmrc $DATADIR/.config/scummvm/scummvm.ini )");
+
 	// Create our OSystem instance
 	g_system = new OSystem_ANDROIDSDL();
 	assert(g_system);

diff --git a/dists/androidsdl/scummvm/AndroidAppSettings.cfg b/dists/androidsdl/scummvm/AndroidAppSettings.cfg
@@ -6,10 +6,10 @@ AppSettingVersion=19
 LibSdlVersion=1.2
 
 # Specify application name (e.x. My Application)
-AppName="ScummVM-SDL"
+AppName="ScummVM"
 
 # Specify reversed site name of application (e.x. com.mysite.myapp)
-AppFullName=org.scummvm.sdl
+AppFullName=org.scummvm.scummvm
 
 # Specify screen orientation: (v)ertical/(p)ortrait or (h)orizontal/(l)andscape
 ScreenOrientation=h
@@ -171,10 +171,10 @@ MultiABI="armeabi"
 AppMinimumRAM=256
 
 # Application version code (integer)
-AppVersionCode=@ANDROID_VERSIONCODE@
+AppVersionCode=19
 
 # Application user-visible version name (string)
-AppVersionName="1.9.0git"
+AppVersionName="1.9.0"
 
 # Reset SDL config when updating application to the new version (y) / (n)
 ResetSdlConfigForThisVersion=y

diff --git a/dists/androidsdl/scummvm/AndroidAppSettings.cfg.in b/dists/androidsdl/scummvm/AndroidAppSettings.cfg.in
@@ -6,10 +6,10 @@ AppSettingVersion=19
 LibSdlVersion=1.2
 
 # Specify application name (e.x. My Application)
-AppName="ScummVM-SDL"
+AppName="ScummVM"
 
 # Specify reversed site name of application (e.x. com.mysite.myapp)
-AppFullName=org.scummvm.sdl
+AppFullName=org.scummvm.scummvm
 
 # Specify screen orientation: (v)ertical/(p)ortrait or (h)orizontal/(l)andscape
 ScreenOrientation=h
@@ -165,7 +165,7 @@ FirstStartMenuOptions=''
 
 # Enable multi-ABI binary, with hardware FPU support - it will also work on old devices,
 # but .apk size is 2x bigger (y) / (n) / (x86) / (all)
-MultiABI="armeabi-v7a"
+MultiABI="armeabi"
 
 # Minimum amount of RAM application requires, in Mb, SDL will print warning to user if it's lower
 AppMinimumRAM=256