Kaydet (Commit) 5b90662d authored tarafından Michael Stahl's avatar Michael Stahl

openssl: use libraries from WORKDIR

Change-Id: I1e7a75ad4c8d35cb6adef8d6c4104f1955ad4574
üst 5a50bb17
......@@ -1338,9 +1338,9 @@ endef
define gb_LinkTarget__use_openssl
$(call gb_LinkTarget_use_package,$(1),openssl)
ifeq ($(OS),WNT)
$(call gb_LinkTarget_use_libraries,$(1),\
crypto \
ssl \
$(call gb_LinkTarget_add_libs,$(1),\
$(call gb_UnpackedTarball_get_dir,openssl)/out32dll/ssleay32.lib \
$(call gb_UnpackedTarball_get_dir,openssl)/out32dll/libeay32.lib \
)
else
$(call gb_LinkTarget_add_libs,$(1),\
......
......@@ -12,13 +12,10 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,openssl,openssl))
$(eval $(call gb_ExternalPackage_use_external_project,openssl,openssl))
ifeq ($(COM),MSC)
$(eval $(call gb_ExternalPackage_add_files,openssl,lib,\
out32dll/ssleay32.lib \
out32dll/libeay32.lib \
))
$(eval $(call gb_ExternalPackage_add_libraries_for_install,openssl,bin,\
out32dll/ssleay32.dll \
out32dll/libeay32.dll \
))
endif
# vim: set noet sw=4 ts=4:
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment