diff options
| author | Peter Foley <pefoley2@verizon.net> | 2011-12-17 18:25:11 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2011-12-17 18:25:11 +0100 |
| commit | 48bd7b190ea20b1c718f6c950f21ba3301157d28 (patch) | |
| tree | 6c2a3f7528d179a646efe540ff57276d77d18605 /extensions/Library_oleautobridge.mk | |
| parent | 9d79b12871522cb9daebf4f6c850e07edcdce08a (diff) | |
extensions: merge Peter Foley's work in olebridge
Diffstat (limited to 'extensions/Library_oleautobridge.mk')
| -rw-r--r-- | extensions/Library_oleautobridge.mk | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/extensions/Library_oleautobridge.mk b/extensions/Library_oleautobridge.mk index 0fda05a62854..807c9e67480f 100644 --- a/extensions/Library_oleautobridge.mk +++ b/extensions/Library_oleautobridge.mk @@ -14,6 +14,7 @@ # # Major Contributor(s): # [ Copyright (C) 2011 Red Hat, Inc., Michael Stahl <mstahl@redhat.com> (initial developer) ] +# [ Copyright (C) 2011 Peter Foley <pefoley2@verizon.net> ] # # All Rights Reserved. # @@ -45,12 +46,23 @@ $(eval $(call gb_Library_add_linked_libs,oleautobridge,\ cppu \ sal \ advapi32 \ - $(if $(USE_DEBUG_RUNTIME),atlsd,atls) ole32 \ oleaut32 \ uuid \ )) +ifeq ($(COM),MSC) +ifneq ($(USE_DEBUG_RUNTIME),) +$(eval $(call gb_Library_add_libs,oleautobridge,\ + $(ATL_LIB)/atlsd.lib \ +)) +else +$(eval $(call gb_Library_add_libs,oleautobridge,\ + $(ATL_LIB)/atls.lib \ +)) +endif +endif + $(eval $(call gb_Library_add_exception_objects,oleautobridge,\ extensions/source/ole/jscriptclasses \ extensions/source/ole/ole2uno \ |