From 371a94ae3c8e109ac6b4422bd121cdc18d744b13 Mon Sep 17 00:00:00 2001 From: Sergii Pylypenko Date: Thu, 6 May 2021 01:53:06 +0300 Subject: [PATCH] Emscripten: fixed linking with freetype library --- os/emscripten/deploy-webapp.sh | 3 ++- os/emscripten/emscripten-build.sh | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/os/emscripten/deploy-webapp.sh b/os/emscripten/deploy-webapp.sh index 877ea08f12..dc0a8c9db7 100755 --- a/os/emscripten/deploy-webapp.sh +++ b/os/emscripten/deploy-webapp.sh @@ -1,6 +1,7 @@ #!/bin/sh INSTALL_PATH=`pwd`/../../../openttd-touch-webapp +MESSAGE="`git log --format=%B -n 1 HEAD`" export NO_CLEAN=1 @@ -8,4 +9,4 @@ export NO_CLEAN=1 cd $INSTALL_PATH || exit 1 -git commit -a && git push +git commit -a -m "$MESSAGE" && git push diff --git a/os/emscripten/emscripten-build.sh b/os/emscripten/emscripten-build.sh index bb76744175..210720a92c 100755 --- a/os/emscripten/emscripten-build.sh +++ b/os/emscripten/emscripten-build.sh @@ -184,12 +184,19 @@ mkdir -p baseset [ -e Makefile ] || emcmake cmake .. \ -DHOST_BINARY_DIR=$(pwd)/build-host -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DOPTION_USE_ASSERTS=OFF \ + -DFREETYPE_INCLUDE_DIRS=`em-config EMSCRIPTEN_ROOT`/cache/sysroot/include/freetype2 \ + -DFREETYPE_LIBRARY="-lfreetype" \ -DFontconfig_INCLUDE_DIR=`pwd`/fontconfig-2.13.1/build-wasm/include \ -DFontconfig_LIBRARY=`pwd`/fontconfig-2.13.1/build-wasm/lib/libfontconfig.a \ -DLZO_INCLUDE_DIR=`pwd`/lzo-2.10/build-wasm/include \ -DLZO_LIBRARY=`pwd`/lzo-2.10/build-wasm/lib/liblzo2.a \ + -DCMAKE_CXX_FLAGS="-sUSE_FREETYPE=1" \ + -DCMAKE_EXE_LINKER_FLAGS="-sUSE_FREETYPE=1 \ + -L`pwd`/expat-2.3.0/build-wasm/lib -lexpat \ + -L`pwd`/libuuid-1.0.3/build-wasm/lib -luuid" \ || exit 1 +# -I`em-config EMSCRIPTEN_ROOT`/cache/sysroot/include/freetype2/freetype # -DTimidity_LIBRARY=`pwd`/libtimidity-0.2.7/build-wasm/lib/libtimidity.a \ # -DTimidity_INCLUDE_DIR=`pwd`/libtimidity-0.2.7/build-wasm/include \