From e597ef0489d9d5504721d21eefa15c65da0fb240 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Tue, 14 Mar 2017 11:59:12 +0200 Subject: No need for --disable-activex and --disable-atl any longer Change-Id: I7ac4f32cb01bfcc3a2c06e69280c2150d408ec6b Reviewed-on: https://gerrit.libreoffice.org/35174 Reviewed-by: David Ostrovsky Reviewed-by: Tor Lillqvist Tested-by: Tor Lillqvist --- shell/Module_shell.mk | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'shell/Module_shell.mk') diff --git a/shell/Module_shell.mk b/shell/Module_shell.mk index c3c6d3f7c03c..cfe7aa061cef 100644 --- a/shell/Module_shell.mk +++ b/shell/Module_shell.mk @@ -61,11 +61,9 @@ $(eval $(call gb_Module_add_targets,shell,\ StaticLibrary_shlxthandler_common \ StaticLibrary_xmlparser \ WinResTarget_shlxthdl \ - $(if $(DISABLE_ACTIVEX),,\ - CustomTarget_spsupp_idl \ - Library_spsupp \ - WinResTarget_spsupp \ - ) \ + CustomTarget_spsupp_idl \ + Library_spsupp \ + WinResTarget_spsupp \ )) $(eval $(call gb_Module_add_check_targets,shell,\ @@ -81,9 +79,7 @@ $(eval $(call gb_Module_add_targets,shell,\ Library_shlxthdl_x64 \ StaticLibrary_shlxthandler_common_x64 \ StaticLibrary_xmlparser_x64 \ - $(if $(DISABLE_ACTIVEX),,\ - Library_spsupp_x64 \ - ) \ + Library_spsupp_x64 \ )) endif -- cgit