From f08723a13890edba90f571079c87b3790000012c Mon Sep 17 00:00:00 2001 From: Gerhard Stein Date: Thu, 2 Aug 2012 19:25:12 +0200 Subject: [PATCH 1/4] Commander Genius Update --- project/jni/application/commandergenius/commandergenius | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/jni/application/commandergenius/commandergenius b/project/jni/application/commandergenius/commandergenius index d4ef5612e..aba08e334 160000 --- a/project/jni/application/commandergenius/commandergenius +++ b/project/jni/application/commandergenius/commandergenius @@ -1 +1 @@ -Subproject commit d4ef5612e979b11b07e4b35c0f683a2a8aefb19a +Subproject commit aba08e33488c91a4234668eff408f88cb7705c8c From 149043d4f1af68661dbc459e9f24bceb0d3ad993 Mon Sep 17 00:00:00 2001 From: Gerhard Stein Date: Thu, 2 Aug 2012 20:21:58 +0200 Subject: [PATCH 2/4] CG Project Update --- project/jni/application/commandergenius/AndroidAppSettings.cfg | 2 +- project/jni/application/commandergenius/commandergenius | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/project/jni/application/commandergenius/AndroidAppSettings.cfg b/project/jni/application/commandergenius/AndroidAppSettings.cfg index 0d29ba687..c0c974655 100644 --- a/project/jni/application/commandergenius/AndroidAppSettings.cfg +++ b/project/jni/application/commandergenius/AndroidAppSettings.cfg @@ -10,7 +10,7 @@ VideoDepthBpp=24 NeedDepthBuffer=n NeedStencilBuffer=n NeedGles2=n -SwVideoMode=y +SwVideoMode=n SdlVideoResize=y SdlVideoResizeKeepAspect=n CompatibilityHacks=n diff --git a/project/jni/application/commandergenius/commandergenius b/project/jni/application/commandergenius/commandergenius index aba08e334..613addc99 160000 --- a/project/jni/application/commandergenius/commandergenius +++ b/project/jni/application/commandergenius/commandergenius @@ -1 +1 @@ -Subproject commit aba08e33488c91a4234668eff408f88cb7705c8c +Subproject commit 613addc99f78d0797c1630895281630aa1e63d64 From 8050b58becd1a377c8a5d50cebfab0b274a00dad Mon Sep 17 00:00:00 2001 From: Gerhard Stein Date: Thu, 2 Aug 2012 20:40:42 +0200 Subject: [PATCH 3/4] Another CG update --- project/jni/application/commandergenius/commandergenius | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/jni/application/commandergenius/commandergenius b/project/jni/application/commandergenius/commandergenius index 613addc99..3d958613b 160000 --- a/project/jni/application/commandergenius/commandergenius +++ b/project/jni/application/commandergenius/commandergenius @@ -1 +1 @@ -Subproject commit 613addc99f78d0797c1630895281630aa1e63d64 +Subproject commit 3d958613b6cff5c350b35f3f9076415b412ce4aa From 12919eecee0ca0119a30489bf472b809c669d6ec Mon Sep 17 00:00:00 2001 From: pelya Date: Fri, 3 Aug 2012 00:31:17 +0300 Subject: [PATCH 4/4] Updated Commander Genius project --- build.sh | 1 + project/jni/application/commandergenius/commandergenius | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 79bcb8c0d..1627fed30 100755 --- a/build.sh +++ b/build.sh @@ -38,6 +38,7 @@ cd project && env PATH=$NDKBUILDPATH nice -n19 ndk-build V=1 -j$NCPU && \ `which ndk-build | sed 's@/ndk-build@@'`/toolchains/arm-linux-androideabi-4.4.3/prebuilt/$MYARCH/bin/arm-linux-androideabi-strip --strip-unneeded libs/armeabi/libapplication.so \ || true ; } && \ ant debug && \ + [ -n "`adb devices | tail -n +2`" ] && \ test -z "$1" && cd bin && \ { adb install -r MainActivity-debug.apk | grep 'Failure' && \ adb uninstall `grep AppFullName ../../AndroidAppSettings.cfg | sed 's/.*=//'` && adb install -r MainActivity-debug.apk ; true ; } && \ diff --git a/project/jni/application/commandergenius/commandergenius b/project/jni/application/commandergenius/commandergenius index 3d958613b..023025901 160000 --- a/project/jni/application/commandergenius/commandergenius +++ b/project/jni/application/commandergenius/commandergenius @@ -1 +1 @@ -Subproject commit 3d958613b6cff5c350b35f3f9076415b412ce4aa +Subproject commit 023025901a1d96a46d826791bf9cf264ddf5c9ee