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 /scp2 | |
| 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 'scp2')
| -rw-r--r-- | scp2/InstallScript_setup_osl.mk | 2 | ||||
| -rw-r--r-- | scp2/Module_scp2.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scp2/InstallScript_setup_osl.mk b/scp2/InstallScript_setup_osl.mk index 1411b5835cf0..862db6190b8f 100644 --- a/scp2/InstallScript_setup_osl.mk +++ b/scp2/InstallScript_setup_osl.mk @@ -22,7 +22,7 @@ $(eval $(call gb_InstallScript_use_modules,setup_osl,\ scp2/writer \ scp2/xsltfilter \ $(if $(filter WNT,$(OS)),\ - $(if $(DISABLE_ACTIVEX),,scp2/activex) \ + scp2/activex \ scp2/quickstart \ scp2/windows \ $(if $(filter MSC,$(COM)),\ diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk index f06f18509351..f94966bb74a7 100644 --- a/scp2/Module_scp2.mk +++ b/scp2/Module_scp2.mk @@ -31,7 +31,7 @@ $(eval $(call gb_Module_add_targets,scp2,\ InstallScript_sdkoo \ ) \ $(if $(filter WNT,$(OS)),\ - $(if $(DISABLE_ACTIVEX),,InstallModule_activex) \ + InstallModule_activex \ InstallModule_quickstart \ InstallModule_windows \ InstallModule_winexplorerext \ |