From 7f7f511c5a74676523ed48435350f6e35282b62b Mon Sep 17 00:00:00 2001 From: Liming Gao Date: Thu, 13 Aug 2020 15:59:05 +0800 Subject: [PATCH] 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 Cc: Bob Feng Cc: Yuwei Chen Reviewed-by: Bob Feng --- BaseTools/set_vsprefix_envs.bat | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/BaseTools/set_vsprefix_envs.bat b/BaseTools/set_vsprefix_envs.bat index 2627587ba32a..d4eb84f0648d 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\