From da41bde2a021e4dde1589b6b062d4b255370c2fb Mon Sep 17 00:00:00 2001
From: Sergii Pylypenko <x.pelya.x@gmail.com>
Date: Tue, 11 Jan 2022 19:46:38 +0200
Subject: [PATCH] SDL: empty Boost symlink was generated

---
 project/jni/Makefile.prebuilt             | 8 ++++----
 project/jni/application/supertux/supertux | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/project/jni/Makefile.prebuilt b/project/jni/Makefile.prebuilt
index 0f2a55a7d..1b761af38 100644
--- a/project/jni/Makefile.prebuilt
+++ b/project/jni/Makefile.prebuilt
@@ -51,13 +51,13 @@ BOOST_LIBS := \
 	wserialization \
 
 
-BOOST := $(foreach ARCH, $(ARCH_LIST), $(foreach NAME, $(BOOST_LIBS), boost/lib/$(ARCH)/libboost_$(NAME).a))
+BOOST := $(foreach ARCH, $(ARCH_LIST), $(foreach NAME, $(strip $(BOOST_LIBS)), boost/lib/$(ARCH)/libboost_$(NAME).a))
 
 .PHONY: all boost icu openssl
 
 all: $(ICONV) $(ICU) $(OPENSSL) $(BOOST)
 
-boost: $(BOOST) $(foreach NAME, $(BOOST_LIBS), boost_$(NAME))
+boost: $(BOOST) $(foreach NAME, $(strip $(BOOST_LIBS)), boost_$(NAME))
 
 icu: $(ICONV) $(ICU)
 
@@ -86,11 +86,11 @@ $(BOOST): boost/src/build-android.sh
 	./build-android.sh --boost=1.78.0 --with-iconv --target-version=16 --arch=$(shell echo $(foreach ARCH, $(ARCH_LIST),$(ARCH),) | tr -d ' ') && \
 	for ARCH in $(ARCH_LIST); do  \
 		mkdir -p ../lib/$$ARCH ../include ; \
-		$(foreach NAME, $(BOOST_LIBS), cp -f build/out/$$ARCH/lib/libboost_$(NAME)-clang-mt-*.a ../lib/$$ARCH/libboost_$(NAME).a || exit 1 ;) \
+		$(foreach NAME, $(strip $(BOOST_LIBS)), cp -f build/out/$$ARCH/lib/libboost_$(NAME)-clang-mt-*.a ../lib/$$ARCH/libboost_$(NAME).a || exit 1 ;) \
 		cp -r -f build/out/$$ARCH/include/boost-*/* ../include/ || exit 1 ; \
 	done || exit 1
 
-$(foreach NAME, $(BOOST_LIBS), boost_$(NAME)):
+$(foreach NAME, $(strip $(BOOST_LIBS)), boost_$(NAME)):
 	ln -sf boost $@
 
 iconv/src/build.sh boost/src/build-android.sh:
diff --git a/project/jni/application/supertux/supertux b/project/jni/application/supertux/supertux
index ea606e3c6..cb737df20 160000
--- a/project/jni/application/supertux/supertux
+++ b/project/jni/application/supertux/supertux
@@ -1 +1 @@
-Subproject commit ea606e3c64b5cb133c432052dddbfb9db047b5f7
+Subproject commit cb737df202b3091967fc85f890b244eeb0673e23