Skip to content

C
core
Kaydet (Commit) 5b90662d authored tarafından Michael Stahl's avatar Michael Stahl
Dosyalara gözat
Seçenekler

openssl: use libraries from WORKDIR 

Change-Id: I1e7a75ad4c8d35cb6adef8d6c4104f1955ad4574
üst 5a50bb17
Expand all Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 7 deletions
RepositoryExternal.mk
Dosyayı görüntüle @ 5b90662d
...@@ -1338,9 +1338,9 @@ endef ...@@ -1338,9 +1338,9 @@ endef
define gb_LinkTarget__use_openssl define gb_LinkTarget__use_openssl
$(call gb_LinkTarget_use_package,$(1),openssl) $(call gb_LinkTarget_use_package,$(1),openssl)
ifeq ($(OS),WNT) ifeq ($(OS),WNT)
$(call gb_LinkTarget_use_libraries,$(1),\ $(call gb_LinkTarget_add_libs,$(1),\
crypto \ $(call gb_UnpackedTarball_get_dir,openssl)/out32dll/ssleay32.lib \
ssl \ $(call gb_UnpackedTarball_get_dir,openssl)/out32dll/libeay32.lib \
) )
else else
$(call gb_LinkTarget_add_libs,$(1),\ $(call gb_LinkTarget_add_libs,$(1),\
......
openssl/ExternalPackage_openssl.mk
Dosyayı görüntüle @ 5b90662d
...@@ -12,13 +12,10 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,openssl,openssl)) ...@@ -12,13 +12,10 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,openssl,openssl))
$(eval $(call gb_ExternalPackage_use_external_project,openssl,openssl)) $(eval $(call gb_ExternalPackage_use_external_project,openssl,openssl))
ifeq ($(COM),MSC) 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,\ $(eval $(call gb_ExternalPackage_add_libraries_for_install,openssl,bin,\
out32dll/ssleay32.dll \ out32dll/ssleay32.dll \
out32dll/libeay32.dll \ out32dll/libeay32.dll \
)) ))
endif endif
# vim: set noet sw=4 ts=4: # 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