From fe5a65deb1348cd1b45702ded0041029add6dadd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=85=E6=88=8E=E6=B0=8F?= Date: Sun, 11 Jun 2023 00:25:59 +0800 Subject: [PATCH] build(env.bat.template): set default envvar these envvar used to have default values in build.bat. now they must be set in env.bat. --- env.bat.template | 10 +++++----- env.vs2017_xp.bat | 2 +- env.vs2019.bat | 2 +- env.vs2022.bat | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/env.bat.template b/env.bat.template index 6a3b74695..cdcb2563f 100644 --- a/env.bat.template +++ b/env.bat.template @@ -5,11 +5,11 @@ set RIME_ROOT=%CD% rem REQUIRED: path to Boost source directory if not defined BOOST_ROOT set BOOST_ROOT=%RIME_ROOT%\deps\boost_1_78_0 -rem OPTIONAL: architecture, Visual Studio version and platform toolset -rem set ARCH=Win32 -rem set BJAM_TOOLSET=msvc-14.2 -rem set CMAKE_GENERATOR="Visual Studio 16 2019" -rem set PLATFORM_TOOLSET=v142 +rem architecture, Visual Studio version and platform toolset +set ARCH=Win32 +set BJAM_TOOLSET=msvc-14.2 +set CMAKE_GENERATOR="Visual Studio 16 2019" +set PLATFORM_TOOLSET=v142 rem OPTIONAL: path to additional build tools rem set DEVTOOLS_PATH=%ProgramFiles%\Git\cmd;%ProgramFiles%\CMake\bin;C:\Python27; diff --git a/env.vs2017_xp.bat b/env.vs2017_xp.bat index 8220cdcac..bcf4a1e3f 100644 --- a/env.vs2017_xp.bat +++ b/env.vs2017_xp.bat @@ -5,7 +5,7 @@ set RIME_ROOT=%CD% rem REQUIRED: path to Boost source directory if not defined BOOST_ROOT set BOOST_ROOT=%RIME_ROOT%\deps\boost_1_69_0 -rem OPTIONAL: architecture, Visual Studio version and platform toolset +rem architecture, Visual Studio version and platform toolset set ARCH=Win32 set BJAM_TOOLSET=msvc-14.1 set CMAKE_GENERATOR="Visual Studio 15 2017" diff --git a/env.vs2019.bat b/env.vs2019.bat index 370054f66..cdcb2563f 100644 --- a/env.vs2019.bat +++ b/env.vs2019.bat @@ -5,7 +5,7 @@ set RIME_ROOT=%CD% rem REQUIRED: path to Boost source directory if not defined BOOST_ROOT set BOOST_ROOT=%RIME_ROOT%\deps\boost_1_78_0 -rem OPTIONAL: architecture, Visual Studio version and platform toolset +rem architecture, Visual Studio version and platform toolset set ARCH=Win32 set BJAM_TOOLSET=msvc-14.2 set CMAKE_GENERATOR="Visual Studio 16 2019" diff --git a/env.vs2022.bat b/env.vs2022.bat index 82d6e5cf9..6f9d7c70e 100644 --- a/env.vs2022.bat +++ b/env.vs2022.bat @@ -5,7 +5,7 @@ set RIME_ROOT=%CD% rem REQUIRED: path to Boost source directory if not defined BOOST_ROOT set BOOST_ROOT=%RIME_ROOT%\deps\boost_1_78_0 -rem OPTIONAL: architecture, Visual Studio version and platform toolset +rem architecture, Visual Studio version and platform toolset set ARCH=Win32 set BJAM_TOOLSET=msvc-14.3 set CMAKE_GENERATOR="Visual Studio 17 2022"