From 6fca826103217ef2eb3674f25066a6a3388ecf60 Mon Sep 17 00:00:00 2001 From: msv Date: Fri, 5 Aug 2022 13:29:14 +0300 Subject: [PATCH] Correct wasm_build.sh to support new structure of freetype directory --- adm/scripts/wasm_build.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/adm/scripts/wasm_build.sh b/adm/scripts/wasm_build.sh index b02a3080c1..3840e966f5 100755 --- a/adm/scripts/wasm_build.sh +++ b/adm/scripts/wasm_build.sh @@ -66,8 +66,8 @@ echo cmake -G "Unix Makefiles" -DCMAKE_TOOLCHAIN_FILE:FILEPATH="${aToolchain}" \ -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" \ +-D3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2:FILEPATH="$aFreeType/include/freetype2" \ +-D3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build:FILEPATH="$aFreeType/include/freetype2" \ -DBUILD_MODULE_FoundationClasses:BOOL="ON" \ -DBUILD_MODULE_ModelingData:BOOL="${BUILD_ModelingData}" \ -DBUILD_MODULE_ModelingAlgorithms:BOOL="${BUILD_ModelingAlgorithms}" \ @@ -84,8 +84,8 @@ cmake -G "Unix Makefiles" -DCMAKE_TOOLCHAIN_FILE:FILEPATH="${aToolchain}" \ -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" \ +-D3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2:FILEPATH="$aFreeType/include/freetype2" \ +-D3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build:FILEPATH="$aFreeType/include/freetype2" \ -DBUILD_MODULE_FoundationClasses:BOOL="ON" \ -DBUILD_MODULE_ModelingData:BOOL="${BUILD_ModelingData}" \ -DBUILD_MODULE_ModelingAlgorithms:BOOL="${BUILD_ModelingAlgorithms}" \ -- 2.39.5