diff options
author | Peter Foley <pefoley2@verizon.net> | 2011-12-18 01:28:13 +0100 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2011-12-18 01:28:13 +0100 |
commit | 1841baf54f053c54969d0164185e2366f9efb3fd (patch) | |
tree | 62ccee153a7d6c84df83a913948b1921a5ac1e21 /extensions/Module_extensions.mk | |
parent | extensions: convert resource, xmlextract to gbuild (diff) | |
download | core-1841baf54f053c54969d0164185e2366f9efb3fd.tar.gz core-1841baf54f053c54969d0164185e2366f9efb3fd.zip |
extensions: convert activex to gbuild
Diffstat (limited to 'extensions/Module_extensions.mk')
-rw-r--r-- | extensions/Module_extensions.mk | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk index 6865f53cf555..348b95eeca95 100644 --- a/extensions/Module_extensions.mk +++ b/extensions/Module_extensions.mk @@ -13,6 +13,7 @@ # # Major Contributor(s): # Copyright (C) 2011 Jan Holesovsky <kendy@suse.cz> (initial developer) +# Copyright (C) 2011 Peter Foley <pefoley2@verizon.net> # # All Rights Reserved. # @@ -51,13 +52,30 @@ $(eval $(call gb_Module_add_targets,extensions,\ )) ifeq ($(OS),WNT) + +ifeq ($(COM),MSC) +ifneq ($(DISABLE_ACTIVEX),TRUE) +$(eval $(call gb_Module_add_targets,extensions,\ + WinResTarget_activex \ + Library_so_activex \ +)) + +ifeq ($(BUILD_X64),TRUE) +$(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 \ Library_oleautobridge2 \ )) -endif -endif +endif # DISABLE_ATL + +endif # WNT ifneq ($(WITH_MOZILLA),NO) |