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 /sal | |
| 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 'sal')
| -rw-r--r-- | sal/osl/unx/nlsupport.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sal/osl/unx/nlsupport.cxx b/sal/osl/unx/nlsupport.cxx index cc07a13805ba..2780a7fdd895 100644 --- a/sal/osl/unx/nlsupport.cxx +++ b/sal/osl/unx/nlsupport.cxx @@ -32,7 +32,7 @@ #include "nlsupport.hxx" // these share a lot, so use one define -#if defined(LINUX) || defined(__sun) || \ +#if defined(LINUX) || defined(EMSCRIPTEN) || defined(__sun) || \ defined(FREEBSD) || defined(OPENBSD) || defined(DRAGONFLY) || defined(NETBSD) #define LO_COMMON_NLS_ARCHS 1 #else @@ -284,7 +284,7 @@ static const Pair nl_language_list[] = { /* XXX MS-874 is an extension to tis620, so this is not * really equivalent */ -#elif defined(LINUX) +#elif defined(LINUX) || defined(EMSCRIPTEN) #if !defined(CODESET) #define CODESET _NL_CTYPE_CODESET_NAME |