diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-05-21 15:41:15 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2022-01-19 10:49:40 +0100 |
| commit | 599cbdb9c2a1184680bb89aa2978e8003eca93d9 (patch) | |
| tree | bc3f48e787d1bab1d74fb8fd66f4bd80bb69dc99 /desktop | |
| parent | 9ae9b3b47c24556b2bc9a100b3bde33273018c5e (diff) | |
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 <glogow@fbihome.de>
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/Module_desktop.mk | 2 | ||||
| -rw-r--r-- | desktop/source/app/officeipcthread.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk index aca0273dc972..191a2cba4c6f 100644 --- a/desktop/Module_desktop.mk +++ b/desktop/Module_desktop.mk @@ -95,7 +95,7 @@ $(eval $(call gb_Module_add_targets,desktop,\ WinResTarget_swriter \ )) -else ifeq (,$(filter MACOSX ANDROID iOS HAIKU,$(OS))) +else ifeq (,$(filter MACOSX ANDROID iOS HAIKU EMSCRIPTEN,$(OS))) ifeq (,$(filter FUZZERS,$(BUILD_TYPE))) $(eval $(call gb_Module_add_targets,desktop,\ diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx index 07880d27fc4c..d748bef60c68 100644 --- a/desktop/source/app/officeipcthread.cxx +++ b/desktop/source/app/officeipcthread.cxx @@ -697,7 +697,7 @@ RequestHandler::Status RequestHandler::Enable(bool ipc) if( pGlobal.is() ) return IPC_STATUS_OK; -#if !HAVE_FEATURE_DESKTOP || HAVE_FEATURE_MACOSX_SANDBOX +#if !HAVE_FEATURE_DESKTOP || HAVE_FEATURE_MACOSX_SANDBOX || defined(EMSCRIPTEN) ipc = false; #endif |