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>
124 lines
2.5 KiB
Makefile
124 lines
2.5 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_Module_Module,shell))
|
|
|
|
$(eval $(call gb_Module_add_targets,shell,\
|
|
$(if $(filter-out MACOSX WNT,$(OS)),Library_desktopbe) \
|
|
Library_localebe \
|
|
))
|
|
|
|
ifneq ($(filter DRAGONFLY FREEBSD LINUX NETBSD OPENBSD,$(OS)),)
|
|
ifeq ($(ENABLE_GIO),TRUE)
|
|
$(eval $(call gb_Module_add_targets,shell,\
|
|
Library_losessioninstall \
|
|
))
|
|
endif
|
|
endif
|
|
|
|
ifeq ($(OS),SOLARIS)
|
|
ifeq ($(ENABLE_GIO),TRUE)
|
|
$(eval $(call gb_Module_add_targets,shell,\
|
|
Library_losessioninstall \
|
|
))
|
|
endif
|
|
endif
|
|
|
|
ifeq ($(ENABLE_KDE5),TRUE)
|
|
$(eval $(call gb_Module_add_targets,shell,\
|
|
Library_kde5be \
|
|
))
|
|
endif
|
|
|
|
ifeq ($(OS),WNT)
|
|
|
|
$(eval $(call gb_Module_add_targets,shell,\
|
|
Executable_regsvrex \
|
|
Executable_senddoc \
|
|
Library_smplmail \
|
|
Library_wininetbe \
|
|
Executable_spsupp_helper \
|
|
))
|
|
|
|
ifeq ($(COM),MSC)
|
|
$(eval $(call gb_Module_add_targets,shell,\
|
|
CustomTarget_shlxthdl_res \
|
|
Library_ooofilt \
|
|
Library_propertyhdl \
|
|
Library_shlxthdl \
|
|
StaticLibrary_shlxthandler_common \
|
|
StaticLibrary_xmlparser \
|
|
WinResTarget_shlxthdl \
|
|
CustomTarget_spsupp_idl \
|
|
WinResTarget_spsupp \
|
|
WinResTarget_spsupp_dlg \
|
|
))
|
|
|
|
$(eval $(call gb_Module_add_check_targets,shell,\
|
|
CppunitTest_shell_zip \
|
|
))
|
|
endif
|
|
|
|
ifeq ($(BUILD_X64),TRUE)
|
|
$(eval $(call gb_Module_add_targets,shell,\
|
|
CustomTarget_x64 \
|
|
Library_ooofilt_x64 \
|
|
Library_propertyhdl_x64 \
|
|
Library_shlxthdl_x64 \
|
|
StaticLibrary_shlxthandler_common_x64 \
|
|
StaticLibrary_xmlparser_x64 \
|
|
))
|
|
endif
|
|
|
|
ifneq ($(CXX_X64_BINARY),)
|
|
$(eval $(call gb_Module_add_targets,shell,\
|
|
Library_spsupp_x64 \
|
|
))
|
|
endif
|
|
|
|
ifneq ($(CXX_X86_BINARY),)
|
|
$(eval $(call gb_Module_add_targets,shell,\
|
|
Library_spsupp_x86 \
|
|
))
|
|
endif
|
|
|
|
endif
|
|
|
|
ifeq ($(OS),MACOSX)
|
|
$(eval $(call gb_Module_add_targets,shell,\
|
|
Library_macbe \
|
|
))
|
|
endif
|
|
|
|
ifeq ($(filter DESKTOP,$(BUILD_TYPE)),DESKTOP)
|
|
|
|
$(eval $(call gb_Module_add_targets,shell,\
|
|
Executable_lngconvex \
|
|
Library_syssh \
|
|
))
|
|
|
|
ifneq ($(OS),WNT)
|
|
|
|
$(eval $(call gb_Module_add_targets,shell,\
|
|
StaticLibrary_xmlparser \
|
|
Executable_uri_encode \
|
|
Library_cmdmail \
|
|
$(if $(ENABLE_MACOSX_SANDBOX),,Package_senddoc) \
|
|
))
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
$(eval $(call gb_Module_add_l10n_targets,shell,\
|
|
AllLangMoTarget_shell \
|
|
))
|
|
|
|
# vim: set shiftwidth=4 tabstop=4 noexpandtab:
|