Skip to content

Commit 23ecc98

Browse files
authored
Merge pull request #10419 from Icinga/fix-boost-1880-build-errors
Support Boost `1.88` on Windows
2 parents d265329 + c4ddd48 commit 23ecc98

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

doc/win-dev.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ function ThrowOnNativeFailure {
1313

1414
$VsVersion = 2019
1515
$MsvcVersion = '14.2'
16-
$BoostVersion = @(1, 87, 0)
16+
$BoostVersion = @(1, 88, 0)
1717
$OpensslVersion = '3_0_16'
1818

1919
switch ($Env:BITS) {

lib/base/win32.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
#define WIN32_LEAN_AND_MEAN
77
#ifndef _WIN32_WINNT
8-
#define _WIN32_WINNT _WIN32_WINNT_VISTA
8+
#define _WIN32_WINNT _WIN32_WINNT_WIN7
99
#endif /* _WIN32_WINNT */
1010
#define NOMINMAX
1111
#include <winsock2.h>

tools/win32/configure-dev.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ if (-not (Test-Path env:OPENSSL_ROOT_DIR)) {
3434
$env:OPENSSL_ROOT_DIR = 'c:\local\OpenSSL-Win64'
3535
}
3636
if (-not (Test-Path env:BOOST_ROOT)) {
37-
$env:BOOST_ROOT = 'c:\local\boost_1_87_0'
37+
$env:BOOST_ROOT = 'c:\local\boost_1_88_0'
3838
}
3939
if (-not (Test-Path env:BOOST_LIBRARYDIR)) {
40-
$env:BOOST_LIBRARYDIR = 'c:\local\boost_1_87_0\lib64-msvc-14.2'
40+
$env:BOOST_LIBRARYDIR = 'c:\local\boost_1_88_0\lib64-msvc-14.2'
4141
}
4242
if (-not (Test-Path env:FLEX_BINARY)) {
4343
$env:FLEX_BINARY = 'C:\ProgramData\chocolatey\bin\win_flex.exe'

tools/win32/configure.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ if (-not (Test-Path env:OPENSSL_ROOT_DIR)) {
3636
$env:OPENSSL_ROOT_DIR = "c:\local\OpenSSL_3_0_16-Win${env:BITS}"
3737
}
3838
if (-not (Test-Path env:BOOST_ROOT)) {
39-
$env:BOOST_ROOT = "c:\local\boost_1_87_0-Win${env:BITS}"
39+
$env:BOOST_ROOT = "c:\local\boost_1_88_0-Win${env:BITS}"
4040
}
4141
if (-not (Test-Path env:BOOST_LIBRARYDIR)) {
42-
$env:BOOST_LIBRARYDIR = "c:\local\boost_1_87_0-Win${env:BITS}\lib${env:BITS}-msvc-14.2"
42+
$env:BOOST_LIBRARYDIR = "c:\local\boost_1_88_0-Win${env:BITS}\lib${env:BITS}-msvc-14.2"
4343
}
4444
if (-not (Test-Path env:FLEX_BINARY)) {
4545
$env:FLEX_BINARY = 'C:\ProgramData\chocolatey\bin\win_flex.exe'

0 commit comments

Comments
 (0)