From c1b3ce202ab35c1e28902d4df6c5b617fba819f7 Mon Sep 17 00:00:00 2001 From: kgv Date: Tue, 31 Aug 2021 10:58:00 +0300 Subject: [PATCH] 0032549: Configuration - fix misprint in adm/scripts/android_build.bat for Draco library name --- adm/scripts/android_build.bat | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/adm/scripts/android_build.bat b/adm/scripts/android_build.bat index 65466d437e..ce1aa67bd2 100644 --- a/adm/scripts/android_build.bat +++ b/adm/scripts/android_build.bat @@ -141,6 +141,9 @@ echo Start building OCCT for %aPlatformAndCompiler%, API level %anApi%>> %aLogFi pushd "%aWorkDir%" +set "aFreeTypeLibName=libfreetype.so" +if exist "%aFreeType%/libs/%anAbi%/libfreetype.a" ( set "aFreeTypeLibName=libfreetype.a" ) + set "aTimeZERO=%TIME%" if ["%toCMake%"] == ["1"] ( echo Configuring OCCT for Android %anAbi%, API level %anApi%... @@ -170,15 +173,14 @@ if ["%toCMake%"] == ["1"] ( -D 3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2:FILEPATH="%aFreeType%/include" ^ -D 3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build:FILEPATH="%aFreeType%/include" ^ -D 3RDPARTY_FREETYPE_LIBRARY_DIR:PATH="%aFreeType%/libs/%anAbi%" ^ - -D 3RDPARTY_FREETYPE_LIBRARY:FILEPATH="%aFreeType%/libs/%anAbi%/libfreetype.so" ^ + -D 3RDPARTY_FREETYPE_LIBRARY:FILEPATH="%aFreeType%/libs/%anAbi%/%aFreeTypeLibName%" ^ -D USE_RAPIDJSON:BOOL="%USE_RAPIDJSON%" ^ -D 3RDPARTY_RAPIDJSON_DIR:PATH="%aRapidJson%" ^ -D 3RDPARTY_RAPIDJSON_INCLUDE_DIR:PATH="%aRapidJson%/include" ^ -D USE_DRACO:BOOL="%USE_DRACO%" ^ -D 3RDPARTY_DRACO_DIR:PATH="%aDraco%" ^ -D 3RDPARTY_DRACO_INCLUDE_DIR:FILEPATH="%aDraco%/include" ^ - -D 3RDPARTY_DRACO_LIBRARY_DIR:PATH="%aDraco%/libs/%anAbi%" ^ - -D 3RDPARTY_DRACO_LIBRARY:FILEPATH="%aDraco%/libs/%anAbi%/libfreetype.so" ^ + -D 3RDPARTY_DRACO_LIBRARY_DIR_draco:PATH="%aDraco%/libs/%anAbi%" ^ "%aCasSrc%" if errorlevel 1 (