From b1f3d180b389cfcbfd3774999d31edeeaea22487 Mon Sep 17 00:00:00 2001 From: Sergii Pylypenko Date: Tue, 11 Jan 2022 19:43:34 +0200 Subject: [PATCH] SDL: better generation of symlinks for Boost --- project/jni/Makefile.prebuilt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/project/jni/Makefile.prebuilt b/project/jni/Makefile.prebuilt index a389d0bc6..0f2a55a7d 100644 --- a/project/jni/Makefile.prebuilt +++ b/project/jni/Makefile.prebuilt @@ -57,7 +57,7 @@ BOOST := $(foreach ARCH, $(ARCH_LIST), $(foreach NAME, $(BOOST_LIBS), boost/lib/ all: $(ICONV) $(ICU) $(OPENSSL) $(BOOST) -boost: $(BOOST) +boost: $(BOOST) $(foreach NAME, $(BOOST_LIBS), boost_$(NAME)) icu: $(ICONV) $(ICU) @@ -88,8 +88,10 @@ $(BOOST): boost/src/build-android.sh 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 ;) \ cp -r -f build/out/$$ARCH/include/boost-*/* ../include/ || exit 1 ; \ - done || exit 1 ; \ - $(foreach NAME, $(BOOST_LIBS), ln -sf boost ../../boost_$(NAME) ;) + done || exit 1 + +$(foreach NAME, $(BOOST_LIBS), boost_$(NAME)): + ln -sf boost $@ iconv/src/build.sh boost/src/build-android.sh: git submodule update --init --recursive