From 588a85798ae7c44864be0b9d823618fc03e2028c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tam=C3=A1s=20Zolnai?= Date: Sat, 11 Mar 2017 05:21:45 +0100 Subject: [PATCH] Fix windows build with activex disabled MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I810241ad4624ae2ad4e42e2dbf4c226f622a35ad Reviewed-on: https://gerrit.libreoffice.org/35070 Tested-by: Jenkins Reviewed-by: Tamás Zolnai --- shell/Module_shell.mk | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/shell/Module_shell.mk b/shell/Module_shell.mk index cfe7aa061cef..c3c6d3f7c03c 100644 --- a/shell/Module_shell.mk +++ b/shell/Module_shell.mk @@ -61,9 +61,11 @@ $(eval $(call gb_Module_add_targets,shell,\ StaticLibrary_shlxthandler_common \ StaticLibrary_xmlparser \ WinResTarget_shlxthdl \ - CustomTarget_spsupp_idl \ - Library_spsupp \ - WinResTarget_spsupp \ + $(if $(DISABLE_ACTIVEX),,\ + CustomTarget_spsupp_idl \ + Library_spsupp \ + WinResTarget_spsupp \ + ) \ )) $(eval $(call gb_Module_add_check_targets,shell,\ @@ -79,7 +81,9 @@ $(eval $(call gb_Module_add_targets,shell,\ Library_shlxthdl_x64 \ StaticLibrary_shlxthandler_common_x64 \ StaticLibrary_xmlparser_x64 \ - Library_spsupp_x64 \ + $(if $(DISABLE_ACTIVEX),,\ + Library_spsupp_x64 \ + ) \ )) endif