58ef8c188b
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>
44 lines
1.2 KiB
Makefile
44 lines
1.2 KiB
Makefile
# -*- 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:
|