summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2019-05-07 21:22:08 +0300
committerMike Kaganski <mike.kaganski@collabora.com>2019-06-14 01:16:22 +0200
commit58ef8c188b6bb2ed307f5e825cc7e475c33d0c33 (patch)
tree4a6cdec70c156052c8b69728ade5ed37cf0d8b1e /solenv
parenta6201725d760cbce832d4de029b418bb7334df6a (diff)
Make spsupp*.dll usable on 64-bit Windows
Build spsupp for both x64 and x86, regardless of target platform. This allows to install the ActiveX component to be used by both 64-bit and 32-bit applications on 64-bit systems (especially IE, which runs both 64-bit and 32-bit processes simultaneously at least on Win10), no matter which LO (32/64) was installed. Move the DLLs from activex feature to ooo, to copy unconditionally. Registration of LO-specific component will be also unconditional; registration of replacement of MSO component will need own feature. This doesn't yet register the component in system: TODO later. Change-Id: Iccf5e73dfae306cb777f844d40611e23c4520a13 Reviewed-on: https://gerrit.libreoffice.org/71925 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'solenv')
-rw-r--r--solenv/gbuild/Library.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index 99688916f4eb..0b8903cc80e6 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -204,6 +204,7 @@ gb_Library_set_include = $(call gb_Library__forward_to_Linktarget,$(subst gb_Lib
gb_Library_add_ldflags = $(call gb_Library__forward_to_Linktarget,$(subst gb_Library_,,$(0)),$(1),$(2),$(3))
gb_Library_set_ldflags = $(call gb_Library__forward_to_Linktarget,$(subst gb_Library_,,$(0)),$(1),$(2),$(3))
gb_Library_set_x64 = $(call gb_Library__forward_to_Linktarget,$(subst gb_Library_,,$(0)),$(1),$(2),$(3))
+gb_Library_set_x86 = $(call gb_Library__forward_to_Linktarget,$(subst gb_Library_,,$(0)),$(1),$(2),$(3))
gb_Library_add_libs = $(call gb_Library__forward_to_Linktarget,$(subst gb_Library_,,$(0)),$(1),$(2),$(3))
gb_Library_disable_standard_system_libs = $(call gb_Library__forward_to_Linktarget,$(subst gb_Library_,,$(0)),$(1),$(2),$(3))
gb_Library_use_system_darwin_frameworks = $(call gb_Library__forward_to_Linktarget,$(subst gb_Library_,,$(0)),$(1),$(2),$(3))