From a12359275f5bfcfa9be561674c4c4f58a6eb8052 Mon Sep 17 00:00:00 2001 From: rdb Date: Sun, 6 Feb 2022 14:45:56 +0100 Subject: [PATCH] makepanda: Support building with OpenSSL 1.1.1 on Windows --- makepanda/makepanda.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index 71aa749a23..42c35436f8 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -771,9 +771,14 @@ if (COMPILER == "MSVC"): if os.path.isfile(GetThirdpartyDir() + "openssl/lib/libpandassl.lib"): LibName("OPENSSL", GetThirdpartyDir() + "openssl/lib/libpandassl.lib") LibName("OPENSSL", GetThirdpartyDir() + "openssl/lib/libpandaeay.lib") - else: + elif os.path.isfile(GetThirdpartyDir() + "openssl/lib/ssleay32.lib"): LibName("OPENSSL", GetThirdpartyDir() + "openssl/lib/libeay32.lib") LibName("OPENSSL", GetThirdpartyDir() + "openssl/lib/ssleay32.lib") + else: + LibName("OPENSSL", GetThirdpartyDir() + "openssl/lib/libssl.lib") + LibName("OPENSSL", GetThirdpartyDir() + "openssl/lib/libcrypto.lib") + LibName("OPENSSL", "crypt32.lib") + LibName("OPENSSL", "ws2_32.lib") if (PkgSkip("PNG")==0): if os.path.isfile(GetThirdpartyDir() + "png/lib/libpng16_static.lib"): LibName("PNG", GetThirdpartyDir() + "png/lib/libpng16_static.lib")