diff options
| -rw-r--r-- | Repository.mk | 11 | ||||
| -rw-r--r-- | solenv/gbuild/Helper.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/Library.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/LinkTarget.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_MSC_class.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/mingw.mk | 3 |
6 files changed, 16 insertions, 5 deletions
diff --git a/Repository.mk b/Repository.mk index abe5e6eed25b..fd4a3bdeaa1b 100644 --- a/Repository.mk +++ b/Repository.mk @@ -599,16 +599,19 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,winexplorer shlxtmsi \ )) -$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ - fop \ - jfregca \ +$(eval $(call gb_Helper_register_libraries,PLAINLIBS_SHLXTHDL, \ ooofilt \ ooofilt_x64 \ propertyhdl \ propertyhdl_x64 \ - regpatchactivex \ shlxthdl \ shlxthdl_x64 \ +)) + +$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ + fop \ + jfregca \ + regpatchactivex \ so_activex \ so_activex_x64 \ sysdtrans \ diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk index 8a5457a07648..62743db9c583 100644 --- a/solenv/gbuild/Helper.mk +++ b/solenv/gbuild/Helper.mk @@ -108,7 +108,7 @@ endef define gb_Helper_init_registries gb_Executable_VALIDGROUPS := UREBIN SDK OOO NONE -gb_Library_VALIDGROUPS := OOOLIBS PLAINLIBS_NONE PLAINLIBS_URE PLAINLIBS_OOO PRIVATELIBS_URE RTVERLIBS UNOVERLIBS EXTENSIONLIBS +gb_Library_VALIDGROUPS := OOOLIBS PLAINLIBS_NONE PLAINLIBS_URE PLAINLIBS_OOO PRIVATELIBS_URE RTVERLIBS UNOVERLIBS EXTENSIONLIBS PLAINLIBS_SHLXTHDL gb_Jar_VALIDGROUPS := URE OOO OXT NONE $$(foreach group,$$(gb_Executable_VALIDGROUPS),$$(eval gb_Executable_$$(group) :=)) diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk index 37c6fbf6a6d4..a8f3cae8f36b 100644 --- a/solenv/gbuild/Library.mk +++ b/solenv/gbuild/Library.mk @@ -32,6 +32,7 @@ gb_Library_LAYER_DIRS := \ URELIB:$(gb_INSTROOT)/$(LIBO_URE_LIB_FOLDER) \ OOO:$(gb_INSTROOT)/$(gb_PROGRAMDIRNAME) \ + SHLXTHDL:$(gb_INSTROOT)/$(gb_PROGRAMDIRNAME)/shlxthdl \ OXT:$(WORKDIR)/LinkTarget/ExtensionLibrary \ NONE:$(gb_Library_DLLDIR) \ @@ -169,6 +170,7 @@ gb_Library__COMPONENTPREFIXES := \ OOO:vnd.sun.star.expand:\dLO_LIB_DIR/ \ URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \ OXT:./ \ + SHLXTHDL:ERROR_NOT_ALLOWED \ define gb_Library__forward_to_Linktarget gb_Library_$(1) = $$(call gb_LinkTarget_$(1),$$(call gb_Library_get_linktarget,$$(1)),$$(2),$$(3),Library_$$(1)) diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index 18430daa2bfc..e1c2a9494577 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -59,6 +59,7 @@ gb_LinkTarget_LAYER_LINKPATHS := \ UREBIN:URELIB. \ SDKBIN:URELIB. \ OOO:URELIB+OOO. \ + SHLXTHDL:. \ OXT:OXT. \ NONE:URELIB+OOO+NONE. \ diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index 25284b93f5f7..92c23910cde6 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -262,6 +262,7 @@ gb_Library_LAYER := \ $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):URELIB) \ $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \ $(foreach lib,$(gb_Library_EXTENSIONLIBS),$(lib):OXT) \ + $(foreach lib,$(gb_Library_PLAINLIBS_SHLXTHDL),$(lib):SHLXTHDL) \ gb_Library_ILIBFILENAMES :=\ $(foreach lib,$(gb_Library_KNOWNLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \ @@ -279,6 +280,7 @@ gb_Library_FILENAMES :=\ $(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):$(lib)$(gb_Library_DLLEXT)) \ $(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):$(lib)$(gb_Library_DLLEXT)) \ $(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(lib)$(gb_Library_DLLEXT)) \ + $(foreach lib,$(gb_Library_PLAINLIBS_SHLXTHDL),$(lib):$(lib)$(gb_Library_DLLEXT)) \ $(foreach lib,$(gb_Library_PRIVATELIBS_URE),$(lib):$(lib)$(gb_Library_OOOEXT)) \ $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):$(lib)$(gb_Library_RTVEREXT)) \ $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):$(lib)$(gb_Library_UNOVEREXT)) \ diff --git a/solenv/gbuild/platform/mingw.mk b/solenv/gbuild/platform/mingw.mk index 8a776fa59abd..ceb67679f006 100644 --- a/solenv/gbuild/platform/mingw.mk +++ b/solenv/gbuild/platform/mingw.mk @@ -194,6 +194,7 @@ gb_Library_LAYER := \ $(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):NONE) \ $(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):URELIB) \ $(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOO) \ + $(foreach lib,$(gb_Library_PLAINLIBS_SHLXTHDL),$(lib):SHLXTHDL) \ $(foreach lib,$(gb_Library_PRIVATELIBS_URE),$(lib):URELIB) \ $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):URELIB) \ $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \ @@ -204,6 +205,7 @@ gb_Library_ILIBFILENAMES :=\ $(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \ $(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \ $(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \ + $(foreach lib,$(gb_Library_PLAINLIBS_SHLXTHDL),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \ $(foreach lib,$(gb_Library_PRIVATELIBS_URE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT)) \ $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTVEREXT)) \ $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):$(gb_Library_UNOVERPRE)$(lib)$(gb_Library_PLAINEXT)) \ @@ -215,6 +217,7 @@ gb_Library_FILENAMES :=\ $(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):$(lib)$(gb_Library_DLLEXT)) \ $(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):$(lib)$(gb_Library_DLLEXT)) \ $(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(lib)$(gb_Library_DLLEXT)) \ + $(foreach lib,$(gb_Library_PLAINLIBS_SHLXTHDL),$(lib):$(lib)$(gb_Library_DLLEXT)) \ $(foreach lib,$(gb_Library_PRIVATELIBS_URE),$(lib):$(lib)$(gb_Library_OOODLLEXT)) \ $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):$(lib)$(gb_Library_RTVERDLLEXT)) \ $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):$(lib)$(gb_Library_UNOVERDLLEXT)) \ |