miguel.horta/commandergenius
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SDL: empty Boost symlink was generated

Browse Source
This commit is contained in:
Sergii Pylypenko
2022-01-11 19:46:38 +02:00
parent b1f3d180b3
commit da41bde2a0
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
project/jni/Makefile.prebuilt
View File

@@ -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:

2
project/jni/application/supertux/supertux

Submodule project/jni/application/supertux/supertux updated: ea606e3c64...cb737df202