Repository.mk | 1 + RepositoryModule_host.mk | 1 + external/libnumbertext/ExternalProject_libnumbertext.mk | 2 +- solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk | 8 +++++--- wasm-qt/Module_wasm-qt.mk | 4 ---- 5 files changed, 8 insertions(+), 8 deletions(-)
New commits: commit c458a071e9c02fa4c6a0f7fe6be5cead518b9f59 Author: Jan-Marek Glogowski <glo...@fbihome.de> AuthorDate: Thu May 27 18:01:35 2021 +0200 Commit: Jan-Marek Glogowski <glo...@fbihome.de> CommitDate: Thu May 27 18:01:35 2021 +0200 Fix qt example and numbertext link Change-Id: I49670d2de880a3034f074b7d338dee6f803f3f04 diff --git a/Repository.mk b/Repository.mk index b234ae7ed69c..8917c46b92c2 100644 --- a/Repository.mk +++ b/Repository.mk @@ -82,6 +82,7 @@ $(eval $(call gb_Helper_register_executables,NONE, \ mtfdemo \ visualbackendtest \ $(if $(and $(ENABLE_GTK3), $(filter LINUX %BSD SOLARIS,$(OS))), gtktiledviewer) \ + $(if $(filter EMSCRIPTEN,$(OS)),wasm-qt5-mandelbrot) \ )) $(eval $(call gb_Helper_register_executables_for_install,SDK,sdk, \ diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index 9aaedfd66ee8..b26979a4b225 100644 --- a/RepositoryModule_host.mk +++ b/RepositoryModule_host.mk @@ -184,6 +184,7 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\ uui \ vbahelper \ vcl \ + $(if $(filter EMSCRIPTEN,$(OS)),wasm-qt) \ wizards \ writerfilter \ writerperfect \ diff --git a/external/libnumbertext/ExternalProject_libnumbertext.mk b/external/libnumbertext/ExternalProject_libnumbertext.mk index 3094351aebf2..eae3f34dc412 100644 --- a/external/libnumbertext/ExternalProject_libnumbertext.mk +++ b/external/libnumbertext/ExternalProject_libnumbertext.mk @@ -16,7 +16,7 @@ $(eval $(call gb_ExternalProject_register_targets,libnumbertext,\ build \ )) -libnumbertext_CXXFLAGS=$(CXXFLAGS) $(CXXFLAGS_CXX11) +libnumbertext_CXXFLAGS=$(CXXFLAGS) $(CXXFLAGS_CXX11) $(gb_EMSCRIPTEN_CPPFLAGS) ifneq (,$(filter ANDROID DRAGONFLY FREEBSD iOS LINUX NETBSD OPENBSD,$(OS))) ifneq (,$(gb_ENABLE_DBGUTIL)) diff --git a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk index 3a7441454f0d..12f63fe78c62 100644 --- a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk +++ b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk @@ -14,7 +14,7 @@ include $(GBUILDDIR)/platform/unxgcc.mk gb_RUN_CONFIGURE := $(SRCDIR)/solenv/bin/run-configure # avoid -s SAFE_HEAP=1 - c.f. gh#8584 this breaks source maps gb_EMSCRIPTEN_CPPFLAGS := -pthread -s TOTAL_MEMORY=1GB -s USE_PTHREADS=1 -s PTHREAD_POOL_SIZE=4 -gb_EMSCRIPTEN_LDFLAGS := $(gb_EMSCRIPTEN_CPPFLAGS) --bind -s ERROR_ON_UNDEFINED_SYMBOLS=1 -s FETCH=1 -s ASSERTIONS=2 -s EXIT_RUNTIME=1 -s EXTRA_EXPORTED_RUNTIME_METHODS=["UTF16ToString","stringToUTF16"] +gb_EMSCRIPTEN_LDFLAGS := $(gb_EMSCRIPTEN_CPPFLAGS) --bind -s ERROR_ON_UNDEFINED_SYMBOLS=1 -s FETCH=1 -s ASSERTIONS=2 -s EXIT_RUNTIME=0 -s EXTRA_EXPORTED_RUNTIME_METHODS=["UTF16ToString","stringToUTF16"] gb_EMSCRIPTEN_QTDEFS := -DQT_NO_LINKED_LIST -DQT_NO_JAVA_STYLE_ITERATORS -DQT_NO_EXCEPTIONS -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB gb_Executable_EXT := .html @@ -27,8 +27,10 @@ gb_LinkTarget_LDFLAGS += $(gb_EMSCRIPTEN_LDFLAGS) $(gb_EMSCRIPTEN_CPPFLAGS) $(gb # Linker and compiler optimize + debug flags are handled in LinkTarget.mk gb_LINKEROPTFLAGS := gb_LINKERSTRIPDEBUGFLAGS := -# This maps to g4, AKA source maps. The LO default would otherwise be g2! -gb_DEBUGINFO_FLAGS = -g +# This maps to g3, no source maps, but DWARF with current emscripten! +# https://developer.chrome.com/blog/wasm-debugging-2020/ +gb_DEBUGINFO_FLAGS = -g3 +#gb_DEBUGINFO_FLAGS = -gsource-map --source-map-base=file://$(WORKDIR)/LinkTarget/Executable # We need at least code elimination, otherwise linking OOMs even with 64GB. # So we "fake" -Og support to mean -O1 for Emscripten and always enable it for debug in configure. gb_COMPILERDEBUGOPTFLAGS := -O1 diff --git a/wasm-qt/Module_wasm-qt.mk b/wasm-qt/Module_wasm-qt.mk index 8e86df4e8baa..72da667363aa 100644 --- a/wasm-qt/Module_wasm-qt.mk +++ b/wasm-qt/Module_wasm-qt.mk @@ -8,13 +8,9 @@ $(eval $(call gb_Module_Module,wasm-qt)) -ifeq ($(OS),EMSCRIPTEN) - $(eval $(call gb_Module_add_targets,wasm-qt,\ CustomTarget_wasm-qt5-mandelbrot_moc \ Executable_wasm-qt5-mandelbrot \ )) -endif - # vim: set noet sw=4 ts=4: _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits