mirror of
https://github.com/pocoproject/poco.git
synced 2025-11-14 04:48:15 +01:00
updated Crypto and NetSSL VS projects, progen files; rebuilt openssl binaries
This commit is contained in:
22
buildwin.ps1
22
buildwin.ps1
@@ -51,7 +51,7 @@ Param
|
||||
[string] $tool = 'msbuild',
|
||||
|
||||
[Parameter()]
|
||||
[string] $openssl_base,
|
||||
[string] $openssl_base = 'default_openssl',
|
||||
|
||||
[Parameter()]
|
||||
[string] $mysql_base,
|
||||
@@ -92,17 +92,17 @@ function Set-Environment
|
||||
if (-Not $Env:PATH.Contains("$Env:POCO_BASE\bin64;$Env:POCO_BASE\bin;"))
|
||||
{ $Env:PATH = "$Env:POCO_BASE\bin64;$Env:POCO_BASE\bin;$Env:PATH" }
|
||||
|
||||
if ($openssl_base -eq '')
|
||||
if ($openssl_base -ne 'default_openssl')
|
||||
{
|
||||
if ($platform -eq 'x64') { $script:openssl_base = 'C:\OpenSSL-Win64' }
|
||||
else { $script:openssl_base = 'C:\OpenSSL-Win32' }
|
||||
}
|
||||
|
||||
$Env:OPENSSL_DIR = "$openssl_base"
|
||||
$Env:OPENSSL_INCLUDE = "$Env:OPENSSL_DIR\include"
|
||||
$Env:OPENSSL_LIB = "$Env:OPENSSL_DIR\lib;$Env:OPENSSL_DIR\lib\VC"
|
||||
Add-Env-Var "OPENSSL" "INCLUDE"
|
||||
Add-Env-Var "OPENSSL" "LIB"
|
||||
$Env:OPENSSL_DIR = "$openssl_base"
|
||||
$Env:OPENSSL_INCLUDE = "$Env:OPENSSL_DIR\include"
|
||||
$Env:OPENSSL_LIB = "$Env:OPENSSL_DIR\lib;$Env:OPENSSL_DIR\lib\VC"
|
||||
Add-Env-Var "OPENSSL" "INCLUDE"
|
||||
Add-Env-Var "OPENSSL" "LIB"
|
||||
}
|
||||
|
||||
if ($mysql_base -ne '')
|
||||
{
|
||||
@@ -179,10 +179,14 @@ function Process-Input
|
||||
Write-Host "Omit: $omit"
|
||||
}
|
||||
|
||||
if ($openssl_base -ne '')
|
||||
if ($openssl_base -ne 'default_openssl')
|
||||
{
|
||||
Write-Host "OpenSSL: $openssl_base"
|
||||
}
|
||||
else
|
||||
{
|
||||
Write-Host "OpenSSL: default (built-in)"
|
||||
}
|
||||
|
||||
if ($mysql_base -ne '')
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user