diff --git a/build_env_x64.bat b/build_env_x64.bat index 89656d5..ea51185 100755 --- a/build_env_x64.bat +++ b/build_env_x64.bat @@ -7,6 +7,8 @@ set VS_Base_Path=C:\Program Files (x86) if exist "%VS_Base_Path%\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat" goto vs2019 if exist "%VS_Base_Path%\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat" goto vs2017 if exist "%VS_Base_Path%\Microsoft Visual Studio 14.0\VC\bin\amd64\vcvars64.bat" goto vs14 +if exist "%VS_Base_Path%\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvars64.bat" goto vs2019_bt +if exist "%VS_Base_Path%\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliary\Build\vcvars64.bat" goto vs2017_bt if exist ".\sdk_standalone\set_vars64.bat" goto gitlabci :vs2019 @@ -21,6 +23,14 @@ goto batend call "%VS_Base_Path%\Microsoft Visual Studio 14.0\VC\bin\amd64\vcvars64.bat" goto batend +:vs2019_bt +call "%VS_Base_Path%\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvars64.bat" +goto batend + +:vs2017_bt +call "%VS_Base_Path%\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliary\Build\vcvars64.bat" +goto batend + :gitlabci call ".\sdk_standalone\set_vars64.bat" goto batend diff --git a/build_env_x86.bat b/build_env_x86.bat index 093b198..b87efd9 100755 --- a/build_env_x86.bat +++ b/build_env_x86.bat @@ -7,6 +7,8 @@ set VS_Base_Path=C:\Program Files (x86) if exist "%VS_Base_Path%\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars32.bat" goto vs2019 if exist "%VS_Base_Path%\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars32.bat" goto vs2017 if exist "%VS_Base_Path%\Microsoft Visual Studio 14.0\VC\bin\amd64_x86\vcvarsamd64_x86.bat" goto vs14 +if exist "%VS_Base_Path%\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvars32.bat" goto vs2019_bt +if exist "%VS_Base_Path%\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliary\Build\vcvars32.bat" goto vs2017_bt if exist ".\sdk_standalone\set_vars32.bat" goto gitlabci :vs2019 @@ -21,6 +23,15 @@ goto batend call "%VS_Base_Path%\Microsoft Visual Studio 14.0\VC\bin\amd64_x86\vcvarsamd64_x86.bat" goto batend +:vs2019_bt +call "%VS_Base_Path%\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvars32.bat" +goto batend + +:vs2017_bt +call "%VS_Base_Path%\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliary\Build\vcvars32.bat" +goto batend + + :gitlabci call ".\sdk_standalone\set_vars32.bat" goto batend