diff --git a/windows/build.ps1 b/windows/build.ps1 index abc139e2..b752bf19 100644 --- a/windows/build.ps1 +++ b/windows/build.ps1 @@ -229,7 +229,7 @@ try { -DCRYPTO_INCLUDE_DIRS="${PREFIX}\include" ` -DCRYPTO_LIBRARY_DIRS="${PREFIX}\lib" ` -DCRYPTO_BIN_DIRS="${PREFIX}\bin" ` - -DCRYPTO_LIBRARIES="${CRYPTO_LIBRARIES}" ` + -DCRYPTO_LIBRARIES="${CRYPTO_LIBRARIES}-${CRYPTO_SOVERSION}" ` -DCMAKE_C_FLAGS_DEBUG="${CFLAGS_DEBUG} ${Fido2Flags}" ` -DCMAKE_C_FLAGS_RELEASE="${CFLAGS_RELEASE} ${Fido2Flags}" ` -DCMAKE_INSTALL_PREFIX="${PREFIX}" "${CMAKE_SYSTEM_VERSION}"; ` @@ -241,7 +241,7 @@ try { ExitOnError # Copy DLLs. if ("${SHARED}" -eq "ON") { - "cbor.dll", "${CRYPTO_LIBRARIES}.dll", "zlib1.dll" | ` + "cbor.dll", "${CRYPTO_LIBRARIES}-${CRYPTO_SOVERSION}.dll", "zlib1.dll" | ` %{ Copy-Item "${PREFIX}\bin\$_" ` -Destination "examples\${Config}" } } diff --git a/windows/const.ps1 b/windows/const.ps1 index a0eaa763..845df7e7 100644 --- a/windows/const.ps1 +++ b/windows/const.ps1 @@ -8,7 +8,8 @@ New-Variable -Name 'LIBRESSL_URL' ` -Value 'https://ftp.openbsd.org/pub/OpenBSD/LibreSSL' ` -Option Constant New-Variable -Name 'LIBRESSL' -Value 'libressl-4.0.0' -Option Constant -New-Variable -Name 'CRYPTO_LIBRARIES' -Value 'crypto-55' -Option Constant +New-Variable -Name 'CRYPTO_LIBRARIES' -Value 'crypto' -Option Constant +New-Variable -Name 'CRYPTO_SOVERSION' -Value '55' -Option Constant # libcbor coordinates. New-Variable -Name 'LIBCBOR' -Value 'libcbor-0.11.0' -Option Constant diff --git a/windows/release.ps1 b/windows/release.ps1 index 6989a5c3..36095fdd 100644 --- a/windows/release.ps1 +++ b/windows/release.ps1 @@ -35,7 +35,7 @@ Function Package-Dynamic(${SRC}, ${DEST}) { Copy-Item "${SRC}\lib\cbor.lib" "${DEST}" Copy-Item "${SRC}\bin\zlib1.dll" "${DEST}" Copy-Item "${SRC}\lib\zlib1.lib" "${DEST}" - Copy-Item "${SRC}\bin\${CRYPTO_LIBRARIES}.dll" "${DEST}" + Copy-Item "${SRC}\bin\${CRYPTO_LIBRARIES}-${CRYPTO_SOVERSION}.dll" "${DEST}" Copy-Item "${SRC}\lib\${CRYPTO_LIBRARIES}.lib" "${DEST}" Copy-Item "${SRC}\bin\fido2.dll" "${DEST}" Copy-Item "${SRC}\lib\fido2.lib" "${DEST}"