diff options
Diffstat (limited to 'PCbuild/env.bat')
| -rw-r--r-- | PCbuild/env.bat | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/PCbuild/env.bat b/PCbuild/env.bat index 8b64ce50dd..2b2c0051ce 100644 --- a/PCbuild/env.bat +++ b/PCbuild/env.bat @@ -1,9 +1,16 @@ @echo off
-set VS10=%ProgramFiles(x86)%\Microsoft Visual Studio 10.0
-IF EXIST "%VS10%" GOTO ok
-set VS10=%ProgramFiles%\Microsoft Visual Studio 10.0
-:ok
+rem This script adds the latest available tools to the path for the current
+rem command window. However, most builds of Python will ignore the version
+rem of the tools on PATH and use PlatformToolset instead. Ideally, both sets of
+rem tools should be the same version to avoid potential conflicts.
+rem
+rem To build Python with an earlier toolset, pass "/p:PlatformToolset=v100" (or
+rem 'v110', 'v120' or 'v140') to the build script.
-echo Build environments: x86, ia64, amd64, x86_amd64, x86_ia64
+echo Build environments: x86, amd64, x86_amd64
echo.
-call "%VS10%\VC\vcvarsall.bat" %1
+set VSTOOLS=%VS140COMNTOOLS%
+if "%VSTOOLS%"=="" set VSTOOLS=%VS120COMNTOOLS%
+if "%VSTOOLS%"=="" set VSTOOLS=%VS110COMNTOOLS%
+if "%VSTOOLS%"=="" set VSTOOLS=%VS100COMNTOOLS%
+call "%VSTOOLS%..\..\VC\vcvarsall.bat" %*
|