miguel.horta/commandergenius
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
pelya
2012-11-21 21:24:02 +02:00
parent b960c2cb50 cfb4cd1999
commit 3e70d3fd60
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
project/jni/application/commandergenius/AndroidAppSettings.cfg
View File

@@ -16,6 +16,7 @@ SdlVideoResizeKeepAspect=n
CompatibilityHacks=n CompatibilityHacks=n
CompatibilityHacksStaticInit=n CompatibilityHacksStaticInit=n
CompatibilityHacksTextInputEmulatesHwKeyboard=n CompatibilityHacksTextInputEmulatesHwKeyboard=n
CompatibilityHacksPreventAudioChopping=n
AppUsesMouse=n AppUsesMouse=n
AppNeedsTwoButtonMouse=n AppNeedsTwoButtonMouse=n
ShowMouseCursor=n ShowMouseCursor=n
@@ -23,7 +24,7 @@ ForceRelativeMouseMode=n
AppNeedsArrowKeys=y AppNeedsArrowKeys=y
AppNeedsTextInput=y AppNeedsTextInput=y
AppUsesJoystick=n AppUsesJoystick=n
AppHandlesJoystickSensitivity=n AppUsesAccelerometer=y
AppUsesMultitouch=n AppUsesMultitouch=n
NonBlockingSwapBuffers=n NonBlockingSwapBuffers=n
RedefinedKeys="LCTRL LALT NO_REMAP NO_REMAP RETURN ESCAPE" RedefinedKeys="LCTRL LALT NO_REMAP NO_REMAP RETURN ESCAPE"
@@ -34,14 +35,19 @@ StartupMenuButtonTimeout=3000
HiddenMenuOptions='' HiddenMenuOptions=''
FirstStartMenuOptions='' FirstStartMenuOptions=''
MultiABI=n MultiABI=n
AppVersionCode=40012 AppMinimumRAM=32
AppVersionName="0.4.0.12" AppVersionCode=100000
AppVersionName="1.0 RC-1"
ResetSdlConfigForThisVersion=n ResetSdlConfigForThisVersion=n
DeleteFilesOnUpgrade="%" DeleteFilesOnUpgrade="%"
CompiledLibraries="tremor ogg" CompiledLibraries="tremor ogg"
CustomBuildScript=n CustomBuildScript=n
AppCflags='-frtti -fexceptions -finline-functions -O2 -DTREMOR=1 -DBUILD_TYPE=LINUX32 -DTARGET_LNX=1 -Werror=strict-aliasing -Werror=cast-align -Werror=pointer-arith -Werror=address' AppCflags='-frtti -fexceptions -finline-functions -O2 -DTREMOR=1 -DBUILD_TYPE=LINUX32 -DTARGET_LNX=1 -Werror=strict-aliasing -Werror=cast-align -Werror=pointer-arith -Werror=address -std=c++11'
AppLdflags='-ltremor' AppLdflags='-ltremor'
AppSubdirsBuild='commandergenius/src/*' AppSubdirsBuild='commandergenius/src/*'
AppCmdline='' AppCmdline=''
ReadmeText='^You may press "Home" now - the data will be downloaded in background' ReadmeText='^You may press "Home" now - the data will be downloaded in background'
MinimumScreenSize=s
AdmobPublisherId=n
AdmobTestDeviceId=
AdmobBannerSize=

2
project/jni/application/commandergenius/commandergenius

Submodule project/jni/application/commandergenius/commandergenius updated: 765291c858...a7be774b3e