From bfcd7ae8b66e73832de2c73df378a6aff947c077 Mon Sep 17 00:00:00 2001 From: pelya Date: Wed, 1 Feb 2012 14:59:40 +0200 Subject: [PATCH] Updated GemRB --- .gitmodules | 3 +++ project/jni/application/gemrb/AndroidAppSettings.cfg | 4 +++- project/jni/application/gemrb/gemrb | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) create mode 160000 project/jni/application/gemrb/gemrb diff --git a/.gitmodules b/.gitmodules index f73ee8b46..610b5ed2c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -16,3 +16,6 @@ [submodule "project/jni/application/ufoai/ufoai"] path = project/jni/application/ufoai/ufoai url = git://ufoai.git.sourceforge.net/gitroot/ufoai/ufoai +[submodule "project/jni/application/gemrb/gemrb"] + path = project/jni/application/gemrb/gemrb + url = git://gemrb.git.sourceforge.net/gitroot/gemrb/gemrb diff --git a/project/jni/application/gemrb/AndroidAppSettings.cfg b/project/jni/application/gemrb/AndroidAppSettings.cfg index 2bb56fccd..c83728ad1 100644 --- a/project/jni/application/gemrb/AndroidAppSettings.cfg +++ b/project/jni/application/gemrb/AndroidAppSettings.cfg @@ -16,6 +16,7 @@ SdlVideoResizeKeepAspect=y CompatibilityHacks=n AppUsesMouse=y AppNeedsTwoButtonMouse=y +ShowMouseCursor=n ForceRelativeMouseMode=n AppNeedsArrowKeys=n AppNeedsTextInput=y @@ -33,10 +34,11 @@ FirstStartMenuOptions='' MultiABI=y AppVersionCode=0700 AppVersionName="0.7.0.0" +ResetSdlConfigForThisVersion=y CompiledLibraries="sdl_mixer sdl_ttf ogg vorbis openal png python" CustomBuildScript=n AppCflags='-fexceptions -finline-functions -O3 -DSTATIC_LINK=Yes -DHAVE_SNPRINTF' AppLdflags='' -AppSubdirsBuild='' +AppSubdirsBuild='gemrb/gemrb/*' AppCmdline='GemRB' ReadmeText='^You may press "Home" now - the data will be downloaded in background' diff --git a/project/jni/application/gemrb/gemrb b/project/jni/application/gemrb/gemrb new file mode 160000 index 000000000..fcffaec2c --- /dev/null +++ b/project/jni/application/gemrb/gemrb @@ -0,0 +1 @@ +Subproject commit fcffaec2ca2b59c4a3287d82eb13f1d6ec1d867a