From ee0df4f895ae382f26a40d46e246850d2ec53d72 Mon Sep 17 00:00:00 2001
From: pelya <x.pelya.x@gmail.com>
Date: Sun, 14 May 2023 19:18:00 +0300
Subject: [PATCH] SDL: various build fixes

---
 .gitmodules           | 7 +++++++
 build.sh              | 1 +
 changeAppSettings.sh  | 4 +++-
 project/jni/boost/src | 2 +-
 project/jni/iconv/src | 2 +-
 5 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index a1973ffee..bb7f5a688 100644
--- a/.gitmodules
+++ b/.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
diff --git a/build.sh b/build.sh
index 3efabf610..f7ad20dc5 100755
--- a/build.sh
+++ b/build.sh
@@ -5,6 +5,7 @@ run_apk=false
 sign_apk=false
 sign_bundle=false
 build_release=true
+[ -z "$ANDROID_SDK_ROOT" ] && ANDROID_SDK_ROOT="$ANDROID_HOME"
 
 while getopts "sirqbh" OPT
 do
diff --git a/changeAppSettings.sh b/changeAppSettings.sh
index 5c6e6b4ee..8f5591b48 100755
--- a/changeAppSettings.sh
+++ b/changeAppSettings.sh
@@ -3,6 +3,7 @@
 AUTO=a
 CHANGED=
 JAVA_SRC_PATH=project/java
+[ -z "$ANDROID_SDK_ROOT" ] && ANDROID_SDK_ROOT="$ANDROID_HOME"
 
 if [ "X$1" = "X-a" ]; then
 	AUTO=a
@@ -1109,6 +1110,7 @@ done
 cd ../../..
 
 SDK_DIR=`grep '^sdk.dir' project/local.properties | sed 's/.*=//'`
+[ -z "$SDK_DIR" ] && SDK_DIR="$ANDROID_HOME"
 [ -z "$SDK_DIR" ] && SDK_DIR=`which android | sed 's@/tools/android$@@'`
 mkdir -p project/libs
 echo "sdk.dir=$SDK_DIR" > project/local.properties
@@ -1136,7 +1138,7 @@ else
 		echo "You need to update ProGuard. Download it here:"
 		echo "https://sourceforge.net/projects/proguard/files/proguard/5.3/proguard5.3.3.zip"
 		echo "Unpack it, then place file proguard.jar to $PROGUARD"
-		exit 1
+		#exit 1
 	}
 fi
 
diff --git a/project/jni/boost/src b/project/jni/boost/src
index ccfc74f1c..e0f41db9a 160000
--- a/project/jni/boost/src
+++ b/project/jni/boost/src
@@ -1 +1 @@
-Subproject commit ccfc74f1c9ceb35d304294d4f1ed3abff43d2e01
+Subproject commit e0f41db9a88180f69aa77abab77c785423f99a2e
diff --git a/project/jni/iconv/src b/project/jni/iconv/src
index be1658d1b..ef036fe0f 160000
--- a/project/jni/iconv/src
+++ b/project/jni/iconv/src
@@ -1 +1 @@
-Subproject commit be1658d1b8d8ef04828a90295f33e3cc8190d224
+Subproject commit ef036fe0fd28de85b91b33dfe9f32d26a18aec58