From ea704ddbb417772a884ee12f77e0943317242cd1 Mon Sep 17 00:00:00 2001 From: Sergii Pylypenko Date: Thu, 7 Jul 2016 19:23:21 +0300 Subject: [PATCH] SDL: yet another Android 2.3 fix --- project/java/MainActivity.java | 2 +- project/jni/application/commandergenius/commandergenius | 2 +- project/jni/application/openttd/AndroidAppSettings.cfg | 4 ++-- project/jni/application/vice/vice | 2 +- project/jni/boost/src | 2 +- project/jni/shmem | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/project/java/MainActivity.java b/project/java/MainActivity.java index 007cd8d2d..eac50be2f 100644 --- a/project/java/MainActivity.java +++ b/project/java/MainActivity.java @@ -354,7 +354,7 @@ public class MainActivity extends Activity mGLView = new DemoGLSurfaceView(this); SetLayerType.get().setLayerType(mGLView); // Add TV screen borders, if needed - if( Globals.TvBorders ) + if( isRunningOnOUYA() && Globals.TvBorders ) { RelativeLayout view = new RelativeLayout(this); RelativeLayout.LayoutParams layout; diff --git a/project/jni/application/commandergenius/commandergenius b/project/jni/application/commandergenius/commandergenius index 4b376d167..c5210b0c4 160000 --- a/project/jni/application/commandergenius/commandergenius +++ b/project/jni/application/commandergenius/commandergenius @@ -1 +1 @@ -Subproject commit 4b376d1675cd4485942749baa1ebd82d1c5bdb4b +Subproject commit c5210b0c4209d6c9b6a49350057877448882a776 diff --git a/project/jni/application/openttd/AndroidAppSettings.cfg b/project/jni/application/openttd/AndroidAppSettings.cfg index 12446fcac..30f2056c9 100644 --- a/project/jni/application/openttd/AndroidAppSettings.cfg +++ b/project/jni/application/openttd/AndroidAppSettings.cfg @@ -7,10 +7,10 @@ AppName="OpenTTD" AppFullName=org.openttd.sdl # Application version code (integer) -AppVersionCode=16162 +AppVersionCode=16163 # Application user-visible version name (string) -AppVersionName="1.6.1.62" +AppVersionName="1.6.1.63" # Specify path to download application data in zip archive in the form 'Description|URL|MirrorURL^Description2|URL2|MirrorURL2^...' # If you'll start Description with '!' symbol it will be enabled by default, other downloads should be selected by user from startup config menu diff --git a/project/jni/application/vice/vice b/project/jni/application/vice/vice index 0b817c357..9f2803c7a 160000 --- a/project/jni/application/vice/vice +++ b/project/jni/application/vice/vice @@ -1 +1 @@ -Subproject commit 0b817c357e5a25d37df98d97930469bd485ebb4c +Subproject commit 9f2803c7abdb760845c2fa64cba0fd1b206d25a5 diff --git a/project/jni/boost/src b/project/jni/boost/src index 5824acb45..bc9ea9d30 160000 --- a/project/jni/boost/src +++ b/project/jni/boost/src @@ -1 +1 @@ -Subproject commit 5824acb451e671205afeb188576be1dd9a2674bd +Subproject commit bc9ea9d3032eb1e2b095484e2052aa2bc2e91767 diff --git a/project/jni/shmem b/project/jni/shmem index c2a28f528..f6b49516c 160000 --- a/project/jni/shmem +++ b/project/jni/shmem @@ -1 +1 @@ -Subproject commit c2a28f528d0b1b2528dda125e8fe8018609e7e9a +Subproject commit f6b49516cf4b13f455a19ec989626be5472830c5