From 2bd49b03b18b63626a6300a49db44e24a049e1f3 Mon Sep 17 00:00:00 2001 From: dotneft Date: Mon, 9 May 2022 14:19:26 +0300 Subject: [PATCH] Fixed OpenSSL compilation for Agent2 on Windows --- Dockerfiles/build-base/windows/Dockerfile.agent | 4 ++-- Dockerfiles/build-base/windows/Dockerfile.agent2 | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Dockerfiles/build-base/windows/Dockerfile.agent b/Dockerfiles/build-base/windows/Dockerfile.agent index 44a331dbc..77a18ecb7 100644 --- a/Dockerfiles/build-base/windows/Dockerfile.agent +++ b/Dockerfiles/build-base/windows/Dockerfile.agent @@ -212,8 +212,8 @@ RUN Set-Location -Path $env:SystemDrive\.; ` --prefix=$env:SystemDrive\openssl_output ` --openssldir=$env:SystemDrive\openssl_output_ssl; ` set CL=/MP; ` - nmake /S; ` - nmake /S install_sw; ` + nmake /S build_sw; ` + nmake /S install_dev; ` Write-Host 'OpenSSL is ready...'; COPY modbus.vs16.vcxproj c:\ diff --git a/Dockerfiles/build-base/windows/Dockerfile.agent2 b/Dockerfiles/build-base/windows/Dockerfile.agent2 index cf58d5781..81536109e 100644 --- a/Dockerfiles/build-base/windows/Dockerfile.agent2 +++ b/Dockerfiles/build-base/windows/Dockerfile.agent2 @@ -242,10 +242,11 @@ RUN Set-Location -Path $env:SystemDrive\.; ` # enable-capieng ` no-capieng ` --api=1.1.0 ` - --prefix=$env:SystemDrive\openssl_output ` - --openssldir=$env:SystemDrive\openssl_output_ssl; ` - mingw32-make -s -j"""$env:NUMBER_OF_PROCESSORS"""; ` - mingw32-make -s -j"""$env:NUMBER_OF_PROCESSORS""" install_sw; ` + --libdir=lib ` + --prefix=$env:SystemDrive/openssl_output ` + --openssldir=$env:SystemDrive/openssl_output_ssl; ` + mingw32-make -s -j"""$env:NUMBER_OF_PROCESSORS""" build_sw; ` + mingw32-make -s -j"""$env:NUMBER_OF_PROCESSORS""" install_dev; ` Write-Host 'OpenSSL is ready...'; ` Write-Host 'Removing cygwin...'; ` Remove-Item -Recurse -Force -Path $env:SystemDrive\cygwin;