From 4e76076cb5913d7868f0efb633c6fbb63e8d2cd7 Mon Sep 17 00:00:00 2001
From: pelya <x.pelya.x@gmail.com>
Date: Sun, 29 Jul 2012 23:50:51 +0300
Subject: [PATCH] Added OpenArena project

---
 .gitmodules                                   |   3 ++
 project/AndroidManifestTemplate.xml           |   2 +-
 .../openarena/AndroidAppSettings.cfg          |  47 ++++++++++++++++++
 .../jni/application/openarena/AndroidBuild.sh |  11 ++++
 .../openarena/AndroidData/data.zip            | Bin 0 -> 1047 bytes
 project/jni/application/openarena/engine      |   1 +
 project/jni/application/openarena/icon.png    |   1 +
 .../video/android/SDL_touchscreenkeyboard.c   |   6 +--
 8 files changed, 67 insertions(+), 4 deletions(-)
 create mode 100644 project/jni/application/openarena/AndroidAppSettings.cfg
 create mode 100755 project/jni/application/openarena/AndroidBuild.sh
 create mode 100644 project/jni/application/openarena/AndroidData/data.zip
 create mode 160000 project/jni/application/openarena/engine
 create mode 120000 project/jni/application/openarena/icon.png

diff --git a/.gitmodules b/.gitmodules
index 1461ff837..d0ce0d619 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -19,3 +19,6 @@
 [submodule "project/jni/application/gemrb/gemrb"]
 	path = project/jni/application/gemrb/gemrb
 	url = git://gemrb.git.sourceforge.net/gitroot/gemrb/gemrb
+[submodule "project/jni/application/openarena/engine"]
+	path = project/jni/application/openarena/engine
+	url = https://github.com/pelya/openarena-engine.git
diff --git a/project/AndroidManifestTemplate.xml b/project/AndroidManifestTemplate.xml
index 3b6864a04..9cf1e248a 100644
--- a/project/AndroidManifestTemplate.xml
+++ b/project/AndroidManifestTemplate.xml
@@ -3,7 +3,7 @@
       package="com.package.name"
       android:versionCode="100"
       android:versionName="1.0.0 - intiial version"
-      android:installLocation="preferExternal"
+      android:installLocation="auto"
 >
     <application android:label="@string/app_name"
                  android:icon="@drawable/icon"
diff --git a/project/jni/application/openarena/AndroidAppSettings.cfg b/project/jni/application/openarena/AndroidAppSettings.cfg
new file mode 100644
index 000000000..b1b936ff4
--- /dev/null
+++ b/project/jni/application/openarena/AndroidAppSettings.cfg
@@ -0,0 +1,47 @@
+# The application settings for Android libSDL port
+AppSettingVersion=17
+LibSdlVersion=1.2
+AppName="OpenArena"
+AppFullName=ws.openarena.sdl
+ScreenOrientation=h
+InhibitSuspend=n
+AppDataDownloadUrl="Game data|http://10.0.2.2/up/oa-0.8.8-1.zip"
+VideoDepthBpp=24
+NeedDepthBuffer=y
+NeedStencilBuffer=y
+NeedGles2=n
+SwVideoMode=n
+SdlVideoResize=y
+SdlVideoResizeKeepAspect=n
+CompatibilityHacks=n
+CompatibilityHacksStaticInit=n
+CompatibilityHacksTextInputEmulatesHwKeyboard=n
+AppUsesMouse=n
+AppNeedsTwoButtonMouse=n
+ShowMouseCursor=n
+ForceRelativeMouseMode=n
+AppNeedsArrowKeys=y
+AppNeedsTextInput=y
+AppUsesJoystick=n
+AppHandlesJoystickSensitivity=n
+AppUsesMultitouch=y
+NonBlockingSwapBuffers=n
+RedefinedKeys="SPACE RETURN NO_REMAP NO_REMAP SPACE ESCAPE"
+AppTouchscreenKeyboardKeysAmount=0
+AppTouchscreenKeyboardKeysAmountAutoFire=0
+RedefinedKeysScreenKb="0 1 2 3 4 5 6 7 8 9"
+StartupMenuButtonTimeout=3000
+HiddenMenuOptions='OptionalDownloadConfig'
+FirstStartMenuOptions=''
+MultiABI=n
+AppVersionCode=101
+AppVersionName="1.01"
+ResetSdlConfigForThisVersion=n
+DeleteFilesOnUpgrade="%"
+CompiledLibraries="sdl_mixer sdl_image freetype curl"
+CustomBuildScript=y
+AppCflags='-O2 -finline-functions'
+AppLdflags=''
+AppSubdirsBuild=''
+AppCmdline=''
+ReadmeText='^Readme text'
diff --git a/project/jni/application/openarena/AndroidBuild.sh b/project/jni/application/openarena/AndroidBuild.sh
new file mode 100755
index 000000000..ed44d22d3
--- /dev/null
+++ b/project/jni/application/openarena/AndroidBuild.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+LOCAL_PATH=`dirname $0`
+LOCAL_PATH=`cd $LOCAL_PATH && pwd`
+
+../setEnvironment.sh make -j8 -C engine \
+PLATFORM=android ARCH=arm USE_LOCAL_HEADERS=0 \
+USE_OPENAL=0 USE_CURL=1 USE_CURL_DLOPEN=0 USE_CODEC_VORBIS=0 USE_MUMBLE=0 USE_FREETYPE=1 \
+USE_RENDERER_DLOPEN=0 USE_INTERNAL_ZLIB=0 USE_INTERNAL_JPEG=1 HAVE_VM_COMPILED=1 &&
+mv -f engine/build/release-android-arm/openarena.arm libapplication.so
+
diff --git a/project/jni/application/openarena/AndroidData/data.zip b/project/jni/application/openarena/AndroidData/data.zip
new file mode 100644
index 0000000000000000000000000000000000000000..cc5b51fe5dc5d04f65b5769b115f8eb14ec1f4cd
GIT binary patch
literal 1047
zcmWIWW@Zs#U|`^2I1~`6^(xurb|EtZgBd4CM1~<JKRsVBDYqargp+~!&7K)nhYz3g
zDXrjUU}Sm0%)kI9-iBoR$ApT+K0mkk%$cj*%q8>6pDE2`KkUQK?Q<~7I!Ul{3lHn9
zl@al(3z8O#n$EhxdDY+aW3yDS;8d5~j?l;LUcQqr?ca9iIiKp>WAzH=zwg}H`aLrH
z{pRzw>0e4z8NRPPapLrg=@<2!6>sr)*vMq{vGX5fw%)+}d;W}<jhEZ*8GQ15>Jm~d
zt)qX*&Z6$fo?mzWyx@CbxpT?Hu4?5lZIiEarpPZ_n9pCi{99z*7q$uSU5=T(nc-bx
zyOVE;(y@JhcI)P>NMtpM?TBHq_x$ku@t@2GvxD~)3Cy`3#%ue-;Goryz)9w-_w24o
z7TI%y>wF{kt~T3)wb%AY|1vrI*6?0!vB5*9joF#^c5eAt6Rdvl{qLXNPx~$RKXrDD
zc)qp%Y0IPek87lZWgo~?h<!D%;J&uu!ox0|q&4i3w^zup={M-VJ-Dz#dam<M-|N99
zrMXVm*Hpfp-?Q+^ig`=i&zCqS2c`&T`9BxcnQKx}-4kB2yKC-)sGjvnr2>289&?>r
za^QRNq<3rO=7zAm-n35J@Zq=FR*wZI{x!JAbp6q!jF_?yoHE|Kno6(aez?10iq+ND
z9Q9o~Q~po>VI-#AwO{^u^)Ab!dCm4bA7qcNFZ#3Y`?HqsNB2B>7Wj7Oyr<V)_qB1e
z7JSy!TPSkLN_All-=|B?1<4N6R(}6`+H30*F1_7rr2jfi@A;GTWByNvpPrmsg;>qf
z>!O9~4Lg#KowpYLBeD9t#yzW}r)StL`f+_nN&eT!qi?ms3*%n>ua0@8zw338=42_m
zXNTr+>nCe9If*Ez&KHYuu8sKkjoV4Q{#w!R$=|mMY&|zcC8}h}<o2cctqNQ>72aR}
zF*8b%NxD$8$Yk*j(<A&FYDD&|vc25Q_I~ceT^Gf#S=H`TC{M5as#uZV_B!j3o8!0D
zPoDmjtjp7x^QEAC7O!dM;*>?|Eeq}B%d>T@oN`ty?WvAC_ww@d8;<X;?65tQZ5Dt0
zS%>{si@LR%c|66j)!Y1joRZ`(Py2a$#pR`6I5#ohvAoUY`Y?0d@}F$m#8}RKxK@0%
zYrggJt@|fli>?%8mUM2HQ|;T3c)I`BW5fBW2Y4!FZr`76_9@YVG2)$U604%fPSqoq
z-?gT$3b`}CtMY8aHNjKL7d*3AYge-fZk#gtizR3Nn$wqae{b1z$KLTqy9x{ER)O!q
z@=Z@KuKdp$;LXS+$BZk}N-)5{l12~<k%d_ySr{$*26(fwfz&ZFFf#ZtFfeRp2JryY
CwB$|z

literal 0
HcmV?d00001

diff --git a/project/jni/application/openarena/engine b/project/jni/application/openarena/engine
new file mode 160000
index 000000000..ddeec4e86
--- /dev/null
+++ b/project/jni/application/openarena/engine
@@ -0,0 +1 @@
+Subproject commit ddeec4e86382ec00bf6e28587fd1a6b242a719f3
diff --git a/project/jni/application/openarena/icon.png b/project/jni/application/openarena/icon.png
new file mode 120000
index 000000000..a198430f0
--- /dev/null
+++ b/project/jni/application/openarena/icon.png
@@ -0,0 +1 @@
+engine/misc/quake3-tango.png
\ No newline at end of file
diff --git a/project/jni/sdl-1.3/src/video/android/SDL_touchscreenkeyboard.c b/project/jni/sdl-1.3/src/video/android/SDL_touchscreenkeyboard.c
index a50df04db..53f4b1f73 100644
--- a/project/jni/sdl-1.3/src/video/android/SDL_touchscreenkeyboard.c
+++ b/project/jni/sdl-1.3/src/video/android/SDL_touchscreenkeyboard.c
@@ -105,7 +105,7 @@ static struct ScreenKbGlState_t
 	GLboolean texture2d;
 	GLuint textureId;
 	GLfloat color[4];
-	GLfloat texEnvMode;
+	GLint texEnvMode;
 	GLboolean blend;
 	GLenum blend1, blend2;
 	GLint texFilter1, texFilter2;
@@ -121,7 +121,7 @@ static inline void beginDrawingTex()
 	oldGlState.texture2d = glIsEnabled(GL_TEXTURE_2D);
 	glGetIntegerv(GL_TEXTURE_BINDING_2D, &oldGlState.textureId);
 	glGetFloatv(GL_CURRENT_COLOR, &(oldGlState.color[0]));
-	glGetTexEnvfv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, &oldGlState.texEnvMode);
+	glGetTexEnviv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, &oldGlState.texEnvMode);
 	oldGlState.blend = glIsEnabled(GL_BLEND);
 	glGetIntegerv(GL_BLEND_SRC, &oldGlState.blend1);
 	glGetIntegerv(GL_BLEND_DST, &oldGlState.blend2);
@@ -151,7 +151,7 @@ static inline void endDrawingTex()
 		glDisable(GL_TEXTURE_2D);
 	glBindTexture(GL_TEXTURE_2D, oldGlState.textureId);
 	glColor4f(oldGlState.color[0], oldGlState.color[1], oldGlState.color[2], oldGlState.color[3]);
-	glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, oldGlState.texEnvMode);
+	glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, oldGlState.texEnvMode);
 	if( oldGlState.blend == GL_FALSE )
 		glDisable(GL_BLEND);
 	glBlendFunc(oldGlState.blend1, oldGlState.blend2);