diff options
| author | Tor Lillqvist <tml@collabora.com> | 2022-12-23 12:23:32 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2022-12-23 11:28:47 +0000 |
| commit | 1f39fd25469f299e5da54f5eef0d127dd2daf5b6 (patch) | |
| tree | 31aeda99f9a7ae2ae7c74c066bec2238fa6dc67b /solenv | |
| parent | 7c3a255e42f17c312af26684c2aed567c1c5a5a3 (diff) | |
Un-confuse Emscripten and Qt5 conditionals
The embedded file system that we construct when building for
Emscripten is not related to whether we use Qt5 or not.
Change-Id: Ibf65cae06093d9130a19780c1116f8b9997c664b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144780
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/platform/unxgcc.mk | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index 461d1f048390..f1cb77a63054 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -178,11 +178,13 @@ $(if $(filter Library,$(TARGETTYPE)), $(call gb_Helper_abbreviate_dirs,\ | cut -d' ' -f1-2 >> $(WORKDIR)/LinkTarget/$(2).exports.tmp && \ $(call gb_Helper_replace_if_different_and_touch,$(WORKDIR)/LinkTarget/$(2).exports.tmp, \ $(WORKDIR)/LinkTarget/$(2).exports,$(1)))) -$(if $(and $(filter CppunitTest Executable,$(TARGETTYPE)),$(filter EMSCRIPTEN,$(OS)),$(filter TRUE,$(ENABLE_QT5))), \ +$(if $(and $(filter CppunitTest Executable,$(TARGETTYPE)),$(filter EMSCRIPTEN,$(OS))), \ +$(if $(filter TRUE,$(ENABLE_QT5)), \ + sed -e 's/@APPNAME@/$(subst $(gb_Executable_EXT),,$(notdir $(1)))/' $(QT5_PLATFORMS_SRCDIR)/wasm_shell.html > $(dir $(1))qt_$(notdir $(1)); \ cp $(QT5_PLATFORMS_SRCDIR)/qtlogo.svg $(QT5_PLATFORMS_SRCDIR)/qtloader.js $(dir $(1)) ; \ - sed -e 's/@APPNAME@/$(subst $(gb_Executable_EXT),,$(notdir $(1)))/' $(QT5_PLATFORMS_SRCDIR)/wasm_shell.html > $(dir $(1))qt_$(notdir $(1)) ; \ +) \ ln -sf $(call gb_CustomTarget_get_workdir,static/emscripten_fs_image)/soffice.data $(dir $(1))/soffice.data ; \ - ln -sf $(call gb_CustomTarget_get_workdir,static/emscripten_fs_image)/soffice.data.js.metadata $(dir $(1))/soffice.data.js.metadata ; \ + ln -sf $(call gb_CustomTarget_get_workdir,static/emscripten_fs_image)/soffice.data.js.metadata $(dir $(1))/soffice.data.js.metadata \ ) endef |