ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update for latest freetype in android dependencies

Browse Source
This commit is contained in:
Benau 2020-08-27 13:06:13 +08:00
parent 4a4da3c96c
commit 4ee72fde50
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
android/make.sh
View File

@ -332,7 +332,7 @@ if [ ! -f "$DIRNAME/obj/freetype_bootstrap.stamp" ]; then
ZLIB_CFLAGS="-I$DIRNAME/obj/zlib/" ZLIB_LIBS="$DIRNAME/obj/zlib/libz.a"\ ZLIB_CFLAGS="-I$DIRNAME/obj/zlib/" ZLIB_LIBS="$DIRNAME/obj/zlib/libz.a"\
LIBPNG_CFLAGS="-I$DIRNAME/obj/libpng/" LIBPNG_LIBS="$DIRNAME/obj/libpng/libpng.a"\ LIBPNG_CFLAGS="-I$DIRNAME/obj/libpng/" LIBPNG_LIBS="$DIRNAME/obj/libpng/libpng.a"\
./configure --host=$HOST --enable-shared=no \ ./configure --host=$HOST --enable-shared=no \
--without-harfbuzz && --without-harfbuzz --without-brotli &&
make $@ make $@
check_error check_error
# We need to rebuild freetype after harfbuzz is compiled # We need to rebuild freetype after harfbuzz is compiled
@ -368,7 +368,7 @@ if [ ! -f "$DIRNAME/obj/freetype.stamp" ]; then
ZLIB_CFLAGS="-fpic -I$DIRNAME/obj/zlib/" ZLIB_LIBS="$DIRNAME/obj/zlib/libz.a" \ ZLIB_CFLAGS="-fpic -I$DIRNAME/obj/zlib/" ZLIB_LIBS="$DIRNAME/obj/zlib/libz.a" \
LIBPNG_CFLAGS="-I$DIRNAME/obj/libpng/" LIBPNG_LIBS="$DIRNAME/obj/libpng/libpng.a" \ LIBPNG_CFLAGS="-I$DIRNAME/obj/libpng/" LIBPNG_LIBS="$DIRNAME/obj/libpng/libpng.a" \
HARFBUZZ_CFLAGS="-I$DIRNAME/obj/harfbuzz/src/" HARFBUZZ_LIBS="$DIRNAME/obj/harfbuzz/src/.libs/libharfbuzz.a" \ HARFBUZZ_CFLAGS="-I$DIRNAME/obj/harfbuzz/src/" HARFBUZZ_LIBS="$DIRNAME/obj/harfbuzz/src/.libs/libharfbuzz.a" \
./configure --host=$HOST --enable-shared=no ./configure --host=$HOST --enable-shared=no --without-brotli
make $@ make $@
check_error check_error
touch "$DIRNAME/obj/freetype.stamp" touch "$DIRNAME/obj/freetype.stamp"