[Libreoffice-commits] .: Branch 'feature/gbuild_merge' - RepositoryExternal.mk solenv/gbuild

[Matus Kukan]

 RepositoryExternal.mk                   |    3 ++-
 solenv/gbuild/platform/WNT_INTEL_MSC.mk |    1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c7c7f8eafdd026a10190f25be52108d456d174db
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Sun May 27 00:21:12 2012 +0200

    no openssl library on Windows
    
    Change-Id: I40df9611be87830e4938ee20a4e3be19767ddfad

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 25a6749..b38b038 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1285,8 +1285,9 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\
 )
 
 ifeq ($(GUI)$(COM),WNTMSC)
+$(call gb_LinkTarget_use_external,$(1),openssl)
+
 $(call gb_LinkTarget_use_libraries,$(1),\
-	openssl \
 	secur32 \
 	ws2_32 \
 	$(if $(filter YES,$(WITH_LDAP)),ldap) \
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index fb833f7..3882327 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -407,7 +407,6 @@ gb_Library_PLAINLIBS_NONE += \
 	$(gb_Library_win32_OLDNAMES) \
 	ole32 \
 	oleaut32 \
-	openssl \
 	propsys \
 	secur32 \
 	shell32 \