Merge branch 'sdl_android' of github.com:pelya/commandergenius into sdl_android

2013-02-22 15:07:58 +02:00
parent fd96ba8557 b0f3c27c7b
commit d3c71aa228
5 changed files with 2 additions and 2 deletions
--- a/project/jni/application/commandergenius/AndroidAppSettings.cfg
+++ b/project/jni/application/commandergenius/AndroidAppSettings.cfg
@@ -47,7 +47,7 @@ ResetSdlConfigForThisVersion=n
 DeleteFilesOnUpgrade="%"
 CompiledLibraries="tremor ogg"
 CustomBuildScript=n
-AppCflags='-frtti -fexceptions -finline-functions -O2 -DTREMOR=1 -DBUILD_TYPE=LINUX -DTARGET_LNX=1 -Werror=strict-aliasing -Werror=cast-align -Werror=pointer-arith -Werror=address -std=c++11'
+AppCflags='-frtti -fexceptions -finline-functions -O2 -DTREMOR=1 -DANDROID=1 -DBUILD_TYPE=LINUX -DTARGET_LNX=1 -Werror=strict-aliasing -Werror=cast-align -Werror=pointer-arith -Werror=address -std=c++11'
 AppLdflags='-ltremor'
 AppOverlapsSystemHeaders=
 AppSubdirsBuild='commandergenius/src/*'
--- a/project/jni/application/commandergenius/AndroidData/keen1.zip
+++ b/project/jni/application/commandergenius/AndroidData/keen1.zip
--- a/project/jni/application/commandergenius/AndroidData/keen4.zip
+++ b/project/jni/application/commandergenius/AndroidData/keen4.zip
--- a/project/jni/application/commandergenius/AndroidData/keen7.zip
+++ b/project/jni/application/commandergenius/AndroidData/keen7.zip
--- a/project/jni/application/commandergenius/commandergenius
+++ b/project/jni/application/commandergenius/commandergenius