33setlocal enabledelayedexpansion
44
55set EDK2_PATH = D:\edk2
6+ set VS_PATH = C:\Program Files\Microsoft Visual Studio\2022\Community
67set EFIFS_PATH = %~dp0
78set NASM_PREFIX = %EDK2_PATH% \BaseTools\Bin\Win32\
89set BUILD = RELEASE
@@ -44,8 +45,8 @@ if /I "%1"=="aarch64" goto aarch64
4445
4546:arm
4647setlocal
47- if exist " C:\Program Files (x86)\Microsoft Visual Studio\2019\Community \VC\Auxiliary\Build\vcvarsamd64_arm.bat" (
48- call " C:\Program Files (x86)\Microsoft Visual Studio\2019\Community \VC\Auxiliary\Build\vcvarsamd64_arm.bat"
48+ if exist " %VS_PATH% \VC\Auxiliary\Build\vcvarsamd64_arm.bat" (
49+ call " %VS_PATH% \VC\Auxiliary\Build\vcvarsamd64_arm.bat"
4950 call edksetup.bat reconfig
5051 call EfiFsPkg\set_grub_cpu.cmd ARM
5152 call build -a ARM -b %BUILD% -t VS2019 -p EfiFsPkg/EfiFsPkg.dsc
@@ -55,8 +56,8 @@ if not "%1"=="" goto out
5556
5657:aarch64
5758setlocal
58- if exist " C:\Program Files (x86)\Microsoft Visual Studio\2019\Community \VC\Auxiliary\Build\vcvarsamd64_arm64.bat" (
59- call " C:\Program Files (x86)\Microsoft Visual Studio\2019\Community \VC\Auxiliary\Build\vcvarsamd64_arm64.bat"
59+ if exist " %VS_PATH% \VC\Auxiliary\Build\vcvarsamd64_arm64.bat" (
60+ call " %VS_PATH% \VC\Auxiliary\Build\vcvarsamd64_arm64.bat"
6061 call edksetup.bat reconfig
6162 call EfiFsPkg\set_grub_cpu.cmd AARCH64
6263 call build -a AARCH64 -b %BUILD% -t VS2019 -p EfiFsPkg/EfiFsPkg.dsc
@@ -66,8 +67,8 @@ if not "%1"=="" goto out
6667
6768:ia32
6869setlocal
69- if exist " C:\Program Files (x86)\Microsoft Visual Studio\2019\Community \VC\Auxiliary\Build\vcvars32.bat" (
70- call " C:\Program Files (x86)\Microsoft Visual Studio\2019\Community \VC\Auxiliary\Build\vcvars32.bat"
70+ if exist " %VS_PATH% \VC\Auxiliary\Build\vcvars32.bat" (
71+ call " %VS_PATH% \VC\Auxiliary\Build\vcvars32.bat"
7172 call edksetup.bat reconfig
7273 call EfiFsPkg\set_grub_cpu.cmd IA32
7374 call build -a IA32 -b %BUILD% -t VS2019 -p EfiFsPkg/EfiFsPkg.dsc
@@ -77,8 +78,8 @@ if not "%1"=="" goto out
7778
7879:x64
7980setlocal
80- if exist " C:\Program Files (x86)\Microsoft Visual Studio\2019\Community \VC\Auxiliary\Build\vcvars64.bat" (
81- call " C:\Program Files (x86)\Microsoft Visual Studio\2019\Community \VC\Auxiliary\Build\vcvars64.bat"
81+ if exist " %VS_PATH% \VC\Auxiliary\Build\vcvars64.bat" (
82+ call " %VS_PATH% \VC\Auxiliary\Build\vcvars64.bat"
8283 call edksetup.bat reconfig
8384 call EfiFsPkg\set_grub_cpu.cmd X64
8485 call build -a X64 -b %BUILD% -t VS2019 -p EfiFsPkg/EfiFsPkg.dsc
0 commit comments