diff options
| author | Liming Gao <liming.gao@intel.com> | 2020-08-13 15:59:05 +0800 |
|---|---|---|
| committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2020-08-14 03:07:59 +0000 |
| commit | 7f7f511c5a74676523ed48435350f6e35282b62b (patch) | |
| tree | 2573657338cc53ac62da194a8cfe36fda700ba25 | |
| parent | 24758e993ae46d0dd304c772c0fe85a3c287c855 (diff) | |
| download | edk2-7f7f511c5a74676523ed48435350f6e35282b62b.tar.gz edk2-7f7f511c5a74676523ed48435350f6e35282b62b.tar.bz2 edk2-7f7f511c5a74676523ed48435350f6e35282b62b.zip | |
BaseTools: Fix the issue in VS2017/VS2019 setting
edksetup.bat VS2017 should set VS2017 only. But now,
it will set VS2017/VS2019 both. This patch corrects it.
Signed-off-by: Liming Gao <liming.gao@intel.com>
Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Yuwei Chen <yuwei.chen@intel.com>
Reviewed-by: Bob Feng <bob.c.feng@intel.com>
| -rw-r--r-- | BaseTools/set_vsprefix_envs.bat | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/BaseTools/set_vsprefix_envs.bat b/BaseTools/set_vsprefix_envs.bat index 2627587ba3..d4eb84f064 100644 --- a/BaseTools/set_vsprefix_envs.bat +++ b/BaseTools/set_vsprefix_envs.bat @@ -167,6 +167,8 @@ if not defined WINSDK_PATH_FOR_RC_EXE ( )
)
+if /I "%1"=="VS2017" goto SetWinDDK
+
:SetVS2019
if not defined VS160COMNTOOLS (
@REM clear two envs so that vcvars32.bat can run successfully.
@@ -226,6 +228,8 @@ if not defined WINSDK_PATH_FOR_RC_EXE ( )
)
+if /I "%1"=="VS2019" goto SetWinDDK
+
:SetWinDDK
if not defined WINDDK3790_PREFIX (
set WINDDK3790_PREFIX=C:\WINDDK\3790.1830\bin\
|