diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2019-05-07 21:22:08 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2019-06-14 01:16:22 +0200 |
| commit | 58ef8c188b6bb2ed307f5e825cc7e475c33d0c33 (patch) | |
| tree | 4a6cdec70c156052c8b69728ade5ed37cf0d8b1e /shell/Library_spsupp_x86.mk | |
| parent | a6201725d760cbce832d4de029b418bb7334df6a (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 'shell/Library_spsupp_x86.mk')
| -rw-r--r-- | shell/Library_spsupp_x86.mk | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/shell/Library_spsupp_x86.mk b/shell/Library_spsupp_x86.mk new file mode 100644 index 000000000000..ba101b7bb4ec --- /dev/null +++ b/shell/Library_spsupp_x86.mk @@ -0,0 +1,44 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_Library_Library,spsupp_x86)) + +$(eval $(call gb_Library_set_x86,spsupp_x86,YES)) + +$(eval $(call gb_Library_use_custom_headers,spsupp_x86,\ + shell/source/win32/spsupp/idl \ +)) + +$(eval $(call gb_Library_set_include,spsupp_x86,\ + -I$(SRCDIR)/shell/inc/spsupp \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_Library_use_system_win32_libs,spsupp_x86,\ + advapi32 \ + kernel32 \ + ole32 \ + oleaut32 \ + user32 \ +)) + +$(eval $(call gb_Library_add_nativeres,spsupp_x86,spsupp)) + +$(eval $(call gb_Library_add_ldflags,spsupp_x86,\ + /DEF:$(SRCDIR)/shell/source/win32/spsupp/spsupp.def \ +)) + +$(eval $(call gb_Library_add_exception_objects,spsupp_x86,\ + shell/source/win32/spsupp/COMOpenDocuments \ + shell/source/win32/spsupp/registrar \ + shell/source/win32/spsupp/spsuppClassFactory \ + shell/source/win32/spsupp/spsuppServ \ +)) + +# vim: set shiftwidth=4 tabstop=4 noexpandtab: |