From b5b66706f452cc08a82f5ae1e812e43c80c19b4e Mon Sep 17 00:00:00 2001 From: fxliang Date: Wed, 28 Feb 2024 08:24:57 +0000 Subject: [PATCH] disable ARCH in env fix build.bat git command typo --- build.bat | 4 ++-- env.vs2019.bat | 2 +- env.vs2022.bat | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.bat b/build.bat index 3b4350a76..332043080 100644 --- a/build.bat +++ b/build.bat @@ -166,7 +166,7 @@ if %build_rime% == 1 ( move deps\opencc\build deps\opencc\build_x64 move deps\yaml-cpp\build deps\yaml-cpp\build_x64 move lib lib_x64 - git co . + git checkout . rem backup x64 build done rem ------------------------------------------------------------------------- @@ -202,7 +202,7 @@ if %build_rime% == 1 ( move deps\opencc\build deps\opencc\build_Win32 move deps\yaml-cpp\build deps\yaml-cpp\build_Win32 move lib lib_Win32 - git co . + git checkout . rem backup Win32 build done cd %WEASEL_ROOT% diff --git a/env.vs2019.bat b/env.vs2019.bat index e01e3dc94..fd32a0f93 100644 --- a/env.vs2019.bat +++ b/env.vs2019.bat @@ -6,7 +6,7 @@ rem REQUIRED: path to Boost source directory if not defined BOOST_ROOT set BOOST_ROOT=%WEASEL_ROOT%\deps\boost_1_78_0 rem OPTIONAL: architecture, Visual Studio version and platform toolset -set ARCH=Win32 +rem set ARCH=Win32 set BJAM_TOOLSET=msvc-14.2 set CMAKE_GENERATOR="Visual Studio 16 2019" set PLATFORM_TOOLSET=v142 diff --git a/env.vs2022.bat b/env.vs2022.bat index f289aa026..4ed3bf11a 100644 --- a/env.vs2022.bat +++ b/env.vs2022.bat @@ -6,7 +6,7 @@ rem REQUIRED: path to Boost source directory if not defined BOOST_ROOT set BOOST_ROOT=%WEASEL_ROOT%\deps\boost_1_78_0 rem OPTIONAL: architecture, Visual Studio version and platform toolset -set ARCH=Win32 +rem set ARCH=Win32 set BJAM_TOOLSET=msvc-14.3 set CMAKE_GENERATOR="Visual Studio 17 2022" set PLATFORM_TOOLSET=v143