diff options
| author | Tamás Zolnai <tamas.zolnai@collabora.com> | 2017-03-11 05:21:45 +0100 |
|---|---|---|
| committer | Tamás Zolnai <tamas.zolnai@collabora.com> | 2017-03-11 09:41:17 +0000 |
| commit | 588a85798ae7c44864be0b9d823618fc03e2028c (patch) | |
| tree | 8a3929fa472977ec4cba3b34dd6905e59ec46cda /shell/Module_shell.mk | |
| parent | 5d6532a94b6737c9fe453bc42beb27c6a83e5119 (diff) | |
Fix windows build with activex disabled
Change-Id: I810241ad4624ae2ad4e42e2dbf4c226f622a35ad
Reviewed-on: https://gerrit.libreoffice.org/35070
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Diffstat (limited to 'shell/Module_shell.mk')
| -rw-r--r-- | shell/Module_shell.mk | 12 |
1 files 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 |