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-20 17:45:00 +0200 |
| commit | 733db098ddce73d951b64fff4b98daddbc0a5979 (patch) | |
| tree | b9d09f88970633c88a393a7bc3cc0877d8e4678d /shell | |
| parent | 82c7ecc4852a6ff39343a43f91c410bd72d2b702 (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>
Reviewed-on: https://gerrit.libreoffice.org/74410
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/Library_spsupp_x64.mk | 5 | ||||
| -rw-r--r-- | shell/Library_spsupp_x86.mk (renamed from shell/Library_spsupp.mk) | 21 | ||||
| -rw-r--r-- | shell/Module_shell.mk | 12 |
3 files changed, 20 insertions, 18 deletions
diff --git a/shell/Library_spsupp_x64.mk b/shell/Library_spsupp_x64.mk index 4b36a6c8d105..1988b2745539 100644 --- a/shell/Library_spsupp_x64.mk +++ b/shell/Library_spsupp_x64.mk @@ -20,11 +20,6 @@ $(eval $(call gb_Library_set_include,spsupp_x64,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_defs,spsupp_x64,\ - -DUNICODE \ - -D_UNICODE \ -)) - $(eval $(call gb_Library_use_system_win32_libs,spsupp_x64,\ advapi32 \ kernel32 \ diff --git a/shell/Library_spsupp.mk b/shell/Library_spsupp_x86.mk index fd9bdba84351..ba101b7bb4ec 100644 --- a/shell/Library_spsupp.mk +++ b/shell/Library_spsupp_x86.mk @@ -7,23 +7,20 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Library_Library,spsupp)) +$(eval $(call gb_Library_Library,spsupp_x86)) -$(eval $(call gb_Library_use_custom_headers,spsupp,\ +$(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,\ +$(eval $(call gb_Library_set_include,spsupp_x86,\ -I$(SRCDIR)/shell/inc/spsupp \ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_defs,spsupp,\ - -DUNICODE \ - -D_UNICODE \ -)) - -$(eval $(call gb_Library_use_system_win32_libs,spsupp,\ +$(eval $(call gb_Library_use_system_win32_libs,spsupp_x86,\ advapi32 \ kernel32 \ ole32 \ @@ -31,13 +28,13 @@ $(eval $(call gb_Library_use_system_win32_libs,spsupp,\ user32 \ )) -$(eval $(call gb_Library_add_nativeres,spsupp,spsupp)) +$(eval $(call gb_Library_add_nativeres,spsupp_x86,spsupp)) -$(eval $(call gb_Library_add_ldflags,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,\ +$(eval $(call gb_Library_add_exception_objects,spsupp_x86,\ shell/source/win32/spsupp/COMOpenDocuments \ shell/source/win32/spsupp/registrar \ shell/source/win32/spsupp/spsuppClassFactory \ diff --git a/shell/Module_shell.mk b/shell/Module_shell.mk index b1bebc69beae..ccee899165b4 100644 --- a/shell/Module_shell.mk +++ b/shell/Module_shell.mk @@ -62,7 +62,6 @@ $(eval $(call gb_Module_add_targets,shell,\ StaticLibrary_xmlparser \ WinResTarget_shlxthdl \ CustomTarget_spsupp_idl \ - Library_spsupp \ WinResTarget_spsupp \ WinResTarget_spsupp_dlg \ )) @@ -80,10 +79,21 @@ $(eval $(call gb_Module_add_targets,shell,\ 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) |