miguel.horta/openttd-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Emscripten: fixed linking with freetype library

Browse Source
This commit is contained in:
Sergii Pylypenko
2021-05-06 01:53:06 +03:00
parent f4a76cc6af
commit 371a94ae3c
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
os/emscripten/deploy-webapp.sh
View File

@@ -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

7
os/emscripten/emscripten-build.sh
View File

@@ -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 \