diff options
| author | Tor Lillqvist <tml@collabora.com> | 2017-03-14 11:59:12 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2017-03-14 21:41:26 +0000 |
| commit | e597ef0489d9d5504721d21eefa15c65da0fb240 (patch) | |
| tree | 7c9e6e1034830b909c155568f17ecb80c9a41322 /shell | |
| parent | 3fa34da687ba4be98319888a90cba6414b9f3fbe (diff) | |
No need for --disable-activex and --disable-atl any longer
Change-Id: I7ac4f32cb01bfcc3a2c06e69280c2150d408ec6b
Reviewed-on: https://gerrit.libreoffice.org/35174
Reviewed-by: David Ostrovsky <david@ostrovsky.org>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/Module_shell.mk | 12 |
1 files changed, 4 insertions, 8 deletions
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 |