diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2019-03-19 08:48:47 +0100 |
|---|---|---|
| committer | Lorn Potter <lorn.potter@gmail.com> | 2019-03-19 20:38:28 +0000 |
| commit | 3ca05b2a2e80863202bdb6a225f72debbb28b8fe (patch) | |
| tree | 3c98c6e28d3f5bceb5b1c7ed2ca5857fd1a9ca2d /mkspecs/wasm-emscripten | |
| parent | cac487f051350ce0d5b2c9dbea0d330b6085e9d5 (diff) | |
Wasm: Build with Qt's freetype, png and zlib
Compilation breaks on Windows and macOS hosts with USE_ZLIB=1.
In addition, it turns out that the versions of the libraries in
Emscripten Ports are outdated. Since we have newer versions
of these libraries in Qt already, we will just use those.
This is a revert of 70b558ad5b7972178b990b33cbd73694775b265f.
Task-number: QTQAINFRA-2835
Change-Id: Ic2642b7d319a3447fd08843657eb0535255e0449
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
Diffstat (limited to 'mkspecs/wasm-emscripten')
| -rw-r--r-- | mkspecs/wasm-emscripten/qmake.conf | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/mkspecs/wasm-emscripten/qmake.conf b/mkspecs/wasm-emscripten/qmake.conf index 855d84c039..c80f2bfb92 100644 --- a/mkspecs/wasm-emscripten/qmake.conf +++ b/mkspecs/wasm-emscripten/qmake.conf @@ -32,15 +32,6 @@ EMCC_COMMON_LFLAGS = \ --bind \ -s \"BINARYEN_TRAP_MODE=\'clamp\'\" -EMCC_USE_PORTS_FLAGS = \ - -s USE_FREETYPE=1 \ - -s USE_ZLIB=1 - -# libpng does not build for WASM_OBJECT_FILES=1, see -# https://github.com/emscripten-core/emscripten/issues/8143 -equals(WASM_OBJECT_FILES, 0):\ - EMCC_USE_PORTS_FLAGS += -s USE_LIBPNG=1 - # The -s arguments can also be used with release builds, # but are here in debug for clarity. EMCC_COMMON_LFLAGS_DEBUG = \ @@ -87,9 +78,6 @@ QMAKE_COMPILER += emscripten QMAKE_CC = emcc QMAKE_CXX = em++ -QMAKE_CFLAGS += $$EMCC_USE_PORTS_FLAGS -QMAKE_CXXFLAGS += $$EMCC_USE_PORTS_FLAGS - QMAKE_LINK = $$QMAKE_CXX QMAKE_LINK_SHLIB = $$QMAKE_CXX QMAKE_LINK_C = $$QMAKE_CC |