Skip to content

Commit 80ecc32

Browse files
committed
add support for Visual Studio 2026, remove unsupported Visual Studio 2015
1 parent 0cd0ef0 commit 80ecc32

File tree

2 files changed

+16
-10
lines changed

2 files changed

+16
-10
lines changed

BUILDING

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ On Unix variants:
2525

2626
On Windows:
2727

28-
* Microsoft Visual Studio 2022, 2019, 2017, or 2015
28+
* Microsoft Visual Studio 2026, 2022, 2019, or 2017
2929

3030

3131
GETTING STARTED
@@ -370,10 +370,8 @@ where <machine type> is one of the following:
370370
* ti3nt (32-bit Intel threaded)
371371
* i3nt (32-bit Intel non-threaded)
372372

373-
If you're using Visual Studio 2022 or 2019, install "Desktop
374-
development with C++" on the "Workloads" tabs and the "C++ 20[xx]
375-
Redistributable MSMs" on the "Individual components" tab under the
376-
"Compilers, build tools, and runtimes" section. The `build.bat` script
373+
If you're using Visual Studio 2026, 2022 or 2019, install "Desktop
374+
development with C++" on the "Workloads" tab. The `build.bat` script
377375
will use `c\vs.bat` to find and set up Microsoft Visual Studio
378376
command-line tools automatically for <machine type>; supply `/keepvs`
379377
if you have set up command-line tools already so that `c\vs.bat`

c/vs.bat

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,18 @@ set Applications=%ProgramFiles%
77
:: Set up Visual Studio command line environment variables given a
88
:: machine type, e.g., amd64 or x86.
99

10+
:: Visual Studio 2026 Enterprise
11+
set BATDIR=%ProgramW6432%\Microsoft Visual Studio\18\Enterprise\VC\Auxiliary\Build
12+
if exist "%BATDIR%\vcvarsall.bat" goto found
13+
14+
:: Visual Studio 2026 Professional
15+
set BATDIR=%ProgramW6432%\Microsoft Visual Studio\18\Professional\VC\Auxiliary\Build
16+
if exist "%BATDIR%\vcvarsall.bat" goto found
17+
18+
:: Visual Studio 2026 Community
19+
set BATDIR=%ProgramW6432%\Microsoft Visual Studio\18\Community\VC\Auxiliary\Build
20+
if exist "%BATDIR%\vcvarsall.bat" goto found
21+
1022
:: Visual Studio 2022 Enterprise
1123
set BATDIR=%ProgramW6432%\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build
1224
if exist "%BATDIR%\vcvarsall.bat" goto found
@@ -51,11 +63,7 @@ if exist "%BATDIR%\vcvarsall.bat" goto found
5163
set BATDIR=%Applications%\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliary\Build
5264
if exist "%BATDIR%\vcvarsall.bat" goto found
5365

54-
:: Visual Studio 2015
55-
set BATDIR=%VS140COMNTOOLS%..\..\VC
56-
if exist "%BATDIR%\vcvarsall.bat" goto found
57-
58-
echo Visual Studio 2022, 2019, 2017, or 2015 must be installed.
66+
echo Visual Studio 2026, 2022, 2019, or 2017 must be installed.
5967
exit 1
6068

6169
:found

0 commit comments

Comments
 (0)