diff --git a/client/3rd/OpenSSL/lib/android/arm64-v8a/libcrypto.a b/client/3rd/OpenSSL/lib/android/arm64-v8a/libcrypto.a deleted file mode 100644 index 0b5fb5e8f..000000000 Binary files a/client/3rd/OpenSSL/lib/android/arm64-v8a/libcrypto.a and /dev/null differ diff --git a/client/3rd/OpenSSL/lib/android/arm64-v8a/libssl.a b/client/3rd/OpenSSL/lib/android/arm64-v8a/libssl.a deleted file mode 100644 index c15c6a0e2..000000000 Binary files a/client/3rd/OpenSSL/lib/android/arm64-v8a/libssl.a and /dev/null differ diff --git a/client/3rd/OpenSSL/lib/android/armeabi-v7a/libcrypto.a b/client/3rd/OpenSSL/lib/android/armeabi-v7a/libcrypto.a deleted file mode 100644 index 60fca0657..000000000 Binary files a/client/3rd/OpenSSL/lib/android/armeabi-v7a/libcrypto.a and /dev/null differ diff --git a/client/3rd/OpenSSL/lib/android/armeabi-v7a/libssl.a b/client/3rd/OpenSSL/lib/android/armeabi-v7a/libssl.a deleted file mode 100644 index 0698640e1..000000000 Binary files a/client/3rd/OpenSSL/lib/android/armeabi-v7a/libssl.a and /dev/null differ diff --git a/client/3rd/OpenSSL/lib/android/x86/libcrypto.a b/client/3rd/OpenSSL/lib/android/x86/libcrypto.a deleted file mode 100644 index a620ec894..000000000 Binary files a/client/3rd/OpenSSL/lib/android/x86/libcrypto.a and /dev/null differ diff --git a/client/3rd/OpenSSL/lib/android/x86/libssl.a b/client/3rd/OpenSSL/lib/android/x86/libssl.a deleted file mode 100644 index 6508ace56..000000000 Binary files a/client/3rd/OpenSSL/lib/android/x86/libssl.a and /dev/null differ diff --git a/client/3rd/OpenSSL/lib/android/x86_64/libcrypto.a b/client/3rd/OpenSSL/lib/android/x86_64/libcrypto.a deleted file mode 100644 index 21fac25f0..000000000 Binary files a/client/3rd/OpenSSL/lib/android/x86_64/libcrypto.a and /dev/null differ diff --git a/client/3rd/OpenSSL/lib/android/x86_64/libssl.a b/client/3rd/OpenSSL/lib/android/x86_64/libssl.a deleted file mode 100644 index 2c371f4f2..000000000 Binary files a/client/3rd/OpenSSL/lib/android/x86_64/libssl.a and /dev/null differ diff --git a/client/3rd/OpenSSL/lib/windows/x86/libcrypto.lib b/client/3rd/OpenSSL/lib/windows/x86/libcrypto.lib deleted file mode 100644 index d8516d7f4..000000000 Binary files a/client/3rd/OpenSSL/lib/windows/x86/libcrypto.lib and /dev/null differ diff --git a/client/3rd/OpenSSL/lib/windows/x86/libssl.lib b/client/3rd/OpenSSL/lib/windows/x86/libssl.lib deleted file mode 100644 index 10f1ae417..000000000 Binary files a/client/3rd/OpenSSL/lib/windows/x86/libssl.lib and /dev/null differ diff --git a/client/3rd/OpenSSL/lib/windows/x86_64/libcrypto.lib b/client/3rd/OpenSSL/lib/windows/x86_64/libcrypto.lib deleted file mode 100644 index 2c7d1a0ae..000000000 Binary files a/client/3rd/OpenSSL/lib/windows/x86_64/libcrypto.lib and /dev/null differ diff --git a/client/3rd/OpenSSL/lib/windows/x86_64/libssl.lib b/client/3rd/OpenSSL/lib/windows/x86_64/libssl.lib deleted file mode 100644 index 188270ef1..000000000 Binary files a/client/3rd/OpenSSL/lib/windows/x86_64/libssl.lib and /dev/null differ diff --git a/client/cmake/3rdparty.cmake b/client/cmake/3rdparty.cmake index 44120cf5c..756f02f52 100644 --- a/client/cmake/3rdparty.cmake +++ b/client/cmake/3rdparty.cmake @@ -54,12 +54,13 @@ else(IOS) set(OPENSSL_PATH "${CLIENT_ROOT_DIR}/3rd/OpenSSL") if(WIN32) + set(OPENSSL_INCLUDE_DIR "${OPENSSL_ROOT_DIR}/lib/windows/include") if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8") - set(OPENSSL_LIB_SSL_PATH "${OPENSSL_PATH}/lib/windows/x86_64/libssl.lib") - set(OPENSSL_LIB_CRYPTO_PATH "${OPENSSL_PATH}/lib/windows/x86_64/libcrypto.lib") + set(OPENSSL_LIB_SSL_PATH "${OPENSSL_PATH}/lib/windows/win64/libssl.lib") + set(OPENSSL_LIB_CRYPTO_PATH "${OPENSSL_PATH}/lib/windows/win64/libcrypto.lib") else() - set(OPENSSL_LIB_SSL_PATH "${OPENSSL_PATH}/lib/windows/x86/libssl.lib") - set(OPENSSL_LIB_CRYPTO_PATH "${OPENSSL_PATH}/lib/windows/x86/libcrypto.lib") + set(OPENSSL_LIB_SSL_PATH "${OPENSSL_PATH}/lib/windows/win32/libssl.lib") + set(OPENSSL_LIB_CRYPTO_PATH "${OPENSSL_PATH}/lib/windows/win32/libcrypto.lib") endif() elseif(APPLE AND NOT IOS) set(OPENSSL_LIB_SSL_PATH "${OPENSSL_PATH}/lib/macos/x86_64/libssl.a") @@ -71,7 +72,7 @@ else(IOS) set(OPENSSL_LIB_CRYPTO_PATH "${OPENSSL_PATH}/lib/ios/iphone/libcrypto.a") elseif(ANDROID) set(abi ${CMAKE_ANDROID_ARCH_ABI}) - + set(OPENSSL_INCLUDE_DIR "${OPENSSL_ROOT_DIR}/lib/android/include") set(OPENSSL_CRYPTO_LIBRARY "${OPENSSL_LIBRARIES_DIR}/android/${abi}/libcrypto.a") set(OPENSSL_SSL_LIBRARY "${OPENSSL_LIBRARIES_DIR}/android/${abi}/libssl.a") set(OPENSSL_LIB_SSL_PATH "${OPENSSL_PATH}/lib/android/${abi}/libssl.a") @@ -82,7 +83,7 @@ else(IOS) file(COPY ${OPENSSL_LIB_SSL_PATH} ${OPENSSL_LIB_CRYPTO_PATH} DESTINATION ${OPENSSL_LIBRARIES_DIR}) - file(COPY "${OPENSSL_PATH}/include" + file(COPY "${OPENSSL_INCLUDE_DIR}" DESTINATION ${OPENSSL_ROOT_DIR}) endif()