From e597ef0489d9d5504721d21eefa15c65da0fb240 Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@collabora.com>
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 <david@ostrovsky.org>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
---
 extensions/Module_extensions.mk | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'extensions')

diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk
index b322b833faac..ba962b810372 100644
--- a/extensions/Module_extensions.mk
+++ b/extensions/Module_extensions.mk
@@ -69,7 +69,6 @@ endif
 ifeq ($(OS),WNT)
 
 ifeq ($(COM),MSC)
-ifneq ($(DISABLE_ACTIVEX),TRUE)
 $(eval $(call gb_Module_add_targets,extensions,\
 	WinResTarget_activex \
 	Library_so_activex \
@@ -82,14 +81,11 @@ $(eval $(call gb_Module_add_targets,extensions,\
 	Library_so_activex_x64 \
 ))
 endif # BUILD_X64
-endif # DISABLE_ACTIVEX
 endif # COM=MSC
 
-ifeq ($(DISABLE_ATL),)
 $(eval $(call gb_Module_add_targets,extensions,\
 	Library_oleautobridge \
 ))
-endif # DISABLE_ATL
 
 endif # WNT
 
-- 
cgit