From: osa <osa@opencascade.com>
Date: Wed, 19 Feb 2020 11:45:10 +0000 (+0300)
Subject: Add building of visualization packages and required FreeType path to .bat files ... 
X-Git-Url: http://git.dev.opencascade.org/gitweb/?a=commitdiff_plain;h=5f16893ffb7a50269c051c27ff98dce493100132;p=occt-copy.git

Add building of visualization packages and required FreeType path to .bat files (for wasm)
---

diff --git a/env_custom.bat.template b/env_custom.bat.template
index 93be6f1a71..ffb10a10be 100644
--- a/env_custom.bat.template
+++ b/env_custom.bat.template
@@ -1,4 +1,5 @@
 set aNbJobs=%NUMBER_OF_PROCESSORS%
+set "aFreeType=%~dp0..\3rdparty\freetype-2.7.1-wasm"
 set "EMSDK_ROOT=%~dp0..\occ-web3d\fips\fips-sdks\emsdk"
 set "PATH=C:\Program Files\CMake\bin;%PATH%"
 set "aBuildRoot=work"
@@ -15,4 +16,4 @@ set BUILD_Draw=OFF
 set BUILD_FndClasses=ON
 set BUILD_ModAlg=OFF
 set BUILD_ModData=OFF
-set BUILD_Viz=OFF
+set BUILD_Viz=ON
diff --git a/env_custom.sh.template b/env_custom.sh.template
index 1c3cc6d530..4555590260 100644
--- a/env_custom.sh.template
+++ b/env_custom.sh.template
@@ -1,4 +1,5 @@
 export aNbJobs=${NUMBER_OF_PROCESSORS}
+export aFreeType=$PWD/../3rdparty/freetype-2.7.1-wasm
 export EMSDK_ROOT=`pwd`/fips/fips-sdks/emsdk
 export aBuildRoot=work
 
@@ -14,4 +15,4 @@ export BUILD_Draw=OFF
 export BUILD_FndClasses=ON
 export BUILD_ModAlg=OFF
 export BUILD_ModData=OFF
-export BUILD_Viz=OFF
+export BUILD_Viz=ON
diff --git a/occ_build_occt_wasm.bat b/occ_build_occt_wasm.bat
index 7496553289..455200c23c 100644
--- a/occ_build_occt_wasm.bat
+++ b/occ_build_occt_wasm.bat
@@ -56,6 +56,9 @@ if ["%toCMake%"] == ["1"] (
  -D INSTALL_DIR:PATH="%aDestDir%" ^
  -D INSTALL_DIR_INCLUDE:STRING="inc" ^
  -D INSTALL_DIR_RESOURCE:STRING="src" ^
+ -D 3RDPARTY_FREETYPE_DIR:PATH="%aFreeType%" ^
+ -D 3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2:FILEPATH="%aFreeType%/include" ^
+ -D 3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build:FILEPATH="%aFreeType%/include" ^
  -D BUILD_MODULE_ApplicationFramework:BOOL="%BUILD_AppFramework%" ^
  -D BUILD_MODULE_DataExchange:BOOL="%BUILD_DataExchange%" ^
  -D BUILD_MODULE_Draw:BOOL="%BUILD_Draw%" ^
diff --git a/occ_build_occt_wasm.sh b/occ_build_occt_wasm.sh
index bfbb64e53e..ceabf9f060 100755
--- a/occ_build_occt_wasm.sh
+++ b/occ_build_occt_wasm.sh
@@ -60,6 +60,9 @@ echo cmake -G "Unix Makefiles" -DCMAKE_TOOLCHAIN_FILE:FILEPATH="${aToolchain}" \
 -DINSTALL_DIR:PATH="${aDestDir}" \
 -DINSTALL_DIR_INCLUDE:STRING="inc" \
 -DINSTALL_DIR_RESOURCE:STRING="src" \
+-D3RDPARTY_FREETYPE_DIR:PATH="$aFreeType" \
+-D3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2:FILEPATH="$aFreeType/include" \
+-D3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build:FILEPATH="$aFreeType/include" \
 -DBUILD_MODULE_ApplicationFramework:BOOL="${BUILD_AppFramework}" \
 -DBUILD_MODULE_DataExchange:BOOL="${BUILD_DataExchange}" \
 -DBUILD_MODULE_Draw:BOOL="${BUILD_Draw}" \
@@ -75,6 +78,9 @@ cmake -G "Unix Makefiles" -DCMAKE_TOOLCHAIN_FILE:FILEPATH="${aToolchain}" \
 -DINSTALL_DIR:PATH="${aDestDir}" \
 -DINSTALL_DIR_INCLUDE:STRING="inc" \
 -DINSTALL_DIR_RESOURCE:STRING="src" \
+-D3RDPARTY_FREETYPE_DIR:PATH="$aFreeType" \
+-D3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2:FILEPATH="$aFreeType/include" \
+-D3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build:FILEPATH="$aFreeType/include" \
 -DBUILD_MODULE_ApplicationFramework:BOOL="${BUILD_AppFramework}" \
 -DBUILD_MODULE_DataExchange:BOOL="${BUILD_DataExchange}" \
 -DBUILD_MODULE_Draw:BOOL="${BUILD_Draw}" \