diff options
author | Matúš Kukan <matus.kukan@gmail.com> | 2012-05-27 00:21:12 +0200 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2012-05-29 07:35:59 +0200 |
commit | 5e32d1570f0e9377c1f59b6784f334903be9bf3f (patch) | |
tree | 222aa8ea8865baa6b6b1fb664aae275d119b310b | |
parent | scp2: fix Windows build (diff) | |
download | core-5e32d1570f0e9377c1f59b6784f334903be9bf3f.tar.gz core-5e32d1570f0e9377c1f59b6784f334903be9bf3f.zip |
no openssl library on Windows
Change-Id: I40df9611be87830e4938ee20a4e3be19767ddfad
-rw-r--r-- | RepositoryExternal.mk | 3 | ||||
-rw-r--r-- | solenv/gbuild/platform/WNT_INTEL_MSC.mk | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 5a4ba259372f..731bad7fa02c 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 fb833f7abaf6..38823274fd63 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 \ |