From 5b56e207fc7da5d0d9076797144238fede546d72 Mon Sep 17 00:00:00 2001 From: Maksim Belov <45949002+artdeell@users.noreply.github.com> Date: Sat, 13 Jul 2024 21:57:40 +0300 Subject: [PATCH] Fix[freetype]: fix path again --- ci_build_android.bash | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ci_build_android.bash b/ci_build_android.bash index 9370b9234a..c4f756814a 100644 --- a/ci_build_android.bash +++ b/ci_build_android.bash @@ -67,7 +67,7 @@ if [ "$SKIP_FREETYPE" != "1" ]; then llvm-strip ./build_android-$LWJGL_BUILD_ARCH/lib/libfreetype.so cd .. - cp freetype-$BUILD_FREETYPE_VERSION/build_android-$LWJGL_BUILD_ARCH/lib/libfreetype.so $LWJGL_NATIVE/freetype/ + cp freetype-$BUILD_FREETYPE_VERSION/build_android-$LWJGL_BUILD_ARCH/lib/libfreetype.so $LWJGL_NATIVE/ rm -rf freetype-$BUILD_FREETYPE_VERSION unset BUILD_FREETYPE_VERSION unset CC @@ -128,7 +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/ -cp $LWJGL_NATIVE/freetype/libfreetype.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