From ebadc2e1176d967d3ed08d259cb6e8e75ebae886 Mon Sep 17 00:00:00 2001 From: Maksim Belov <45949002+artdeell@users.noreply.github.com> Date: Sat, 13 Jul 2024 21:49:00 +0300 Subject: [PATCH] Fix[freetype]: add missing slash, properly copy lib --- ci_build_android.bash | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ci_build_android.bash b/ci_build_android.bash index cb453dd206..c3ec17883b 100644 --- a/ci_build_android.bash +++ b/ci_build_android.bash @@ -66,7 +66,7 @@ if [ "$SKIP_FREETYPE" != "1" ]; then make install llvm-strip ./build_android-$LWJGL_BUILD_ARCH/lib/libfreetype.so - cp ./build_android-$LWJGL_BUILD_ARCH/lib/libfreetype.so $LWJGL_NATIVE + cp ./build_android-$LWJGL_BUILD_ARCH/lib/libfreetype.so $LWJGL_NATIVE/ cd .. rm -rf freetype-$BUILD_FREETYPE_VERSION unset BUILD_FREETYPE_VERSION @@ -128,6 +128,9 @@ yes | ant -Dplatform.linux=true \ rm -rf bin/out; mkdir bin/out find $LWJGL_NATIVE -name 'liblwjgl*.so' -exec cp {} bin/out/ \; cp $LWJGL_NATIVE/shaderc/libshaderc.so bin/out/ +if[ -e $LWJGL_NATIVE/libfreetype.so ]; then + cp $LWJGL_NATIVE/libfreetype.so bin/out/ +fi # Cleanup unused output jar files find bin/RELEASE \( -name '*-natives-*' -o -name '*-sources.jar' \) -delete