From 599cbdb9c2a1184680bb89aa2978e8003eca93d9 Mon Sep 17 00:00:00 2001 From: Jan-Marek Glogowski Date: Fri, 21 May 2021 15:41:15 +0200 Subject: WASM more initial bits and pieces All the small stuff, which is needed for the WASM build, but is not really worth an extra patch. * No soffice.sh script needed for WASM * WASM soffice.bin executable extension is html * Some small additional SAL_LOG output * Default to colibre icon theme * Test for qt5 even without X11 * Remove emconfigure artefacts at the end of the configure run * No oosplash for WASM * Disable the Office IPC thread * Suppress -Wno-enum-conversion for Cairo builds * Fix libnumbertext by using gb_EMSCRIPTEN_CPPFLAGS * Map EMSCRIPTEN to LINUX nls * No extra newlines for missing icon theme images * Print the missing dependency in some gbuild error messages * Copy Qt WASM loader, HTML template and SVG logo for binaries * Especially build the vcldemo for Emscripten Change-Id: I356370c72cc09357411e14d0c00762152877a800 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128584 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski --- Repository.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Repository.mk') diff --git a/Repository.mk b/Repository.mk index 19dc0b034189..895d99fbadc2 100644 --- a/Repository.mk +++ b/Repository.mk @@ -1054,7 +1054,7 @@ $(eval $(call gb_Helper_register_packages_for_install,brand,\ desktop_branding \ $(if $(CUSTOM_BRAND_DIR),desktop_branding_custom) \ $(if $(filter DESKTOP,$(BUILD_TYPE)),desktop_scripts_install) \ - $(if $(and $(filter-out MACOSX HAIKU WNT,$(OS)),$(filter DESKTOP,$(BUILD_TYPE))),\ + $(if $(and $(filter-out EMSCRIPTEN HAIKU MACOSX WNT,$(OS)),$(filter DESKTOP,$(BUILD_TYPE))),\ $(if $(DISABLE_GUI),, \ desktop_soffice_sh \ ) \ -- cgit