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>

diff --git a/BaseTools/set_vsprefix_envs.bat b/BaseTools/set_vsprefix_envs.bat
index 2627587ba32a90ed379dfc49af647a45db753e7e..d4eb84f0648d54ec9dfde9111f0239275ba44d5e 100644 (file)
--- a/BaseTools/set_vsprefix_envs.bat
+++ b/BaseTools/set_vsprefix_envs.bat
@@ -167,6 +167,8 @@ if not defined WINSDK_PATH_FOR_RC_EXE (
   )\r
 )\r
 \r
+if /I "%1"=="VS2017" goto SetWinDDK\r
+\r
 :SetVS2019\r
 if not defined VS160COMNTOOLS (\r
   @REM clear two envs so that vcvars32.bat can run successfully.\r
@@ -226,6 +228,8 @@ if not defined WINSDK_PATH_FOR_RC_EXE (
   )\r
 )\r
 \r
+if /I "%1"=="VS2019" goto SetWinDDK\r
+\r
 :SetWinDDK\r
 if not defined WINDDK3790_PREFIX (\r
   set WINDDK3790_PREFIX=C:\WINDDK\3790.1830\bin\\r