0032549: Configuration - fix misprint in adm/scripts/android_build.bat for Draco...

diff --git a/adm/scripts/android_build.bat b/adm/scripts/android_build.bat
index c67b1a87ca4802b8781b92aa49a8efe570588154..ce1aa67bd28a568d22e701a39590f9029fc8dab4 100644 (file)
--- 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,14 +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_DIR_draco:PATH="%aDraco%/libs/%anAbi%" ^
  "%aCasSrc%"
 
   if errorlevel 1 (