From bcfd019efec3e1b755b357cdd97ab36290583179 Mon Sep 17 00:00:00 2001
From: Sergii Pylypenko <x.pelya.x@gmail.com>
Date: Wed, 16 Mar 2016 20:18:41 +0200
Subject: [PATCH] Added bochs submodule

---
 .gitmodules                                          | 3 +++
 project/jni/application/bochs/.gitignore             | 1 +
 project/jni/application/bochs/AndroidAppSettings.cfg | 1 +
 project/jni/application/bochs/AndroidBuild.sh        | 1 +
 project/jni/application/bochs/AndroidData            | 1 +
 project/jni/application/bochs/bochs                  | 1 +
 project/jni/application/bochs/icon.png               | 1 +
 todo.txt                                             | 2 +-
 8 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 project/jni/application/bochs/.gitignore
 create mode 120000 project/jni/application/bochs/AndroidAppSettings.cfg
 create mode 120000 project/jni/application/bochs/AndroidBuild.sh
 create mode 120000 project/jni/application/bochs/AndroidData
 create mode 160000 project/jni/application/bochs/bochs
 create mode 120000 project/jni/application/bochs/icon.png

diff --git a/.gitmodules b/.gitmodules
index 66b3fa917..8cb714ad2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -71,3 +71,6 @@
 [submodule "project/jni/application/xserver/pulseaudio"]
 	path = project/jni/application/xserver/pulseaudio
 	url = git@github.com:pelya/pulseaudio-android.git
+[submodule "project/jni/application/bochs/bochs"]
+	path = project/jni/application/bochs/bochs
+	url = git@github.com:lubomyr/bochs.git
diff --git a/project/jni/application/bochs/.gitignore b/project/jni/application/bochs/.gitignore
new file mode 100644
index 000000000..a70e5d2a6
--- /dev/null
+++ b/project/jni/application/bochs/.gitignore
@@ -0,0 +1 @@
+/*.so
diff --git a/project/jni/application/bochs/AndroidAppSettings.cfg b/project/jni/application/bochs/AndroidAppSettings.cfg
new file mode 120000
index 000000000..6a48054af
--- /dev/null
+++ b/project/jni/application/bochs/AndroidAppSettings.cfg
@@ -0,0 +1 @@
+bochs/android/bochs/AndroidAppSettings.cfg
\ No newline at end of file
diff --git a/project/jni/application/bochs/AndroidBuild.sh b/project/jni/application/bochs/AndroidBuild.sh
new file mode 120000
index 000000000..bb9455efc
--- /dev/null
+++ b/project/jni/application/bochs/AndroidBuild.sh
@@ -0,0 +1 @@
+bochs/android/bochs/AndroidBuild.sh
\ No newline at end of file
diff --git a/project/jni/application/bochs/AndroidData b/project/jni/application/bochs/AndroidData
new file mode 120000
index 000000000..63de56800
--- /dev/null
+++ b/project/jni/application/bochs/AndroidData
@@ -0,0 +1 @@
+bochs/android/bochs/AndroidData
\ No newline at end of file
diff --git a/project/jni/application/bochs/bochs b/project/jni/application/bochs/bochs
new file mode 160000
index 000000000..708b76591
--- /dev/null
+++ b/project/jni/application/bochs/bochs
@@ -0,0 +1 @@
+Subproject commit 708b765915235f3cfed51d0d67892b22343e7228
diff --git a/project/jni/application/bochs/icon.png b/project/jni/application/bochs/icon.png
new file mode 120000
index 000000000..17bdbb5c3
--- /dev/null
+++ b/project/jni/application/bochs/icon.png
@@ -0,0 +1 @@
+bochs/android/bochs/icon.png
\ No newline at end of file
diff --git a/todo.txt b/todo.txt
index 937779faf..f6937ea8f 100644
--- a/todo.txt
+++ b/todo.txt
@@ -7,7 +7,7 @@ TODO, which will get actually done
 
 - TeeWorlds: aiming with gyroscope.
 
-- OpenArena: fix aiming angles jumping at random after the first zoom and after respawn, publish to Android TV.
+- OpenArena: publish to Android TV.
 
 - OpenArena: fix VR mode, add settings for eye separation and focus angle.