SDL: various build fixes

.gitmodules

@@ -9,12 +9,15 @@
 [submodule "project/jni/application/commandergenius/commandergenius"]
 	path = project/jni/application/commandergenius/commandergenius
 	url = https://github.com/gerstrong/Commander-Genius.git
+	update = merge
 [submodule "project/jni/application/openarena/engine"]
 	path = project/jni/application/openarena/engine
 	url = https://github.com/pelya/openarena-engine.git
+	update = merge
 [submodule "project/jni/application/openarena/vm"]
 	path = project/jni/application/openarena/vm
 	url = https://github.com/pelya/openarena-vm
+	update = merge
 [submodule "project/jni/application/teeworlds/src"]
 	path = project/jni/application/teeworlds/src
 	url = https://github.com/pelya/teeworlds.git
@@ -42,6 +45,7 @@
 	path = project/jni/application/openttd/src
 	url = https://github.com/pelya/openttd-android.git
 	branch = 1.10
+	update = merge
 [submodule "project/jni/application/uae4all2"]
 	path = project/jni/application/uae4all2
 	url = https://github.com/lubomyr/uae4all2.git
@@ -73,13 +77,16 @@
 	path = project/jni/application/openttd-jgrpp/src
 	url = https://github.com/pelya/OpenTTD-JGR-patchpack.git
 	branch = android-desktop
+	update = merge
 [submodule "project/jni/application/liero/src"]
 	path = project/jni/application/liero/src
 	url = https://github.com/pelya/liero-android.git
+	update = merge
 [submodule "project/jni/application/openlierox/src"]
 	path = project/jni/application/openlierox/src
 	url = https://github.com/albertz/openlierox.git
 	branch = half-assed-android-port
+	update = merge
 [submodule "project/jni/application/xserver-debian/debian-image"]
 	path = project/jni/application/xserver-debian/debian-image
 	url = https://github.com/pelya/debian-noroot