openssl: better attempt at finding the openssl libraries

diff --git a/basis/openssl/libcrypto/libcrypto.factor b/basis/openssl/libcrypto/libcrypto.factor
index 90d23b24cc12baff6e5edde27baf6ff2e0681ae1..567538c8b62c338d0341c8626f99b19fab2b4e1b 100644 (file)
--- a/basis/openssl/libcrypto/libcrypto.factor
+++ b/basis/openssl/libcrypto/libcrypto.factor
@@ -1,12 +1,12 @@
 ! Copyright (C) 2007 Elie CHAFTARI, 2009 Maxim Savchenko
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.c-types alien.destructors alien.libraries
-alien.syntax classes.struct combinators system ;
-
+alien.libraries.finder alien.syntax classes.struct combinators
+system ;
 IN: openssl.libcrypto
 
 << "libcrypto" {
-    { [ os windows? ] [ "libcrypto-37.dll" ] }
+    { [ os windows? ] [ { "libcrypto-3-x64.dll" "libcrypto-37.dll" "libcrypto-38.dll" } find-library-from-list ] }
     { [ os macosx? ] [ "libcrypto.35.dylib" ] }
     { [ os unix? ] [ "libcrypto.so" ] }
 } cond cdecl add-library >>

diff --git a/basis/openssl/libssl/libssl.factor b/basis/openssl/libssl/libssl.factor
index 537e10f98474f1735d94fb93b86ee61bd48a5b37..9a4df49d8c79464917e083bbabec108ce8141f89 100644 (file)
--- a/basis/openssl/libssl/libssl.factor
+++ b/basis/openssl/libssl/libssl.factor
@@ -8,7 +8,7 @@ words ;
 IN: openssl.libssl
 
 << "libssl" {
-    { [ os windows? ] [ "libssl-38.dll" ] }
+    { [ os windows? ] [ { "libssl-3-x64.dll" "libssl-38.dll" } find-library-from-list ] }
     { [ os macosx? ] [ "libssl.35.dylib" ] }
     { [ os unix? ] [ "libssl.so" ] }
 } cond cdecl add-library >>