From df07555061ffae47adc5ac01e85be8141fa58b9a Mon Sep 17 00:00:00 2001 From: Oliver Smith-Denny Date: Fri, 19 Jun 2026 07:21:54 -0700 Subject: [PATCH] EmulatorPkg: Update DSC/Readme for VS2026 edk2 is moving to VS2026 for the MSVC toolchain. Update the building instructions and DSC conditionals. Signed-off-by: Oliver Smith-Denny --- EmulatorPkg/EmulatorPkg.dsc | 5 +++-- EmulatorPkg/Readme.md | 8 ++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/EmulatorPkg/EmulatorPkg.dsc b/EmulatorPkg/EmulatorPkg.dsc index e554f54245..7766d5d56d 100644 --- a/EmulatorPkg/EmulatorPkg.dsc +++ b/EmulatorPkg/EmulatorPkg.dsc @@ -557,6 +557,7 @@ # +--------------------+--------+----------+------------+-----+----+--------+ # | OS/Compiler | VS2019 | CLANGPDB | CLANGDWARF | GCC | XCODE5 | # | | VS2022 | | | GCCNOLTO | | +# | | VS2026 | | | | | # +--------------------+--------+----------+------------+----------+--------+ # | Windows/VS |IA32/X64| | | | | # | Windows/LLVM/VS | | IA32/X64 | | | | @@ -597,7 +598,7 @@ # macOS/XCODE: macOS environment with XCODE5 installed. # !if $(WIN_MINGW32_BUILD) - !if $(TOOL_CHAIN_TAG) in "VS2019 VS2022" + !if $(TOOL_CHAIN_TAG) in "VS2019 VS2022 VS2026" !error EmulatorPkg not supported for Mingw/VS20xx builds !endif !if $(TOOL_CHAIN_TAG) in "CLANGPDB" @@ -615,7 +616,7 @@ !error EmulatorPkg not supported for Windows/CLANGDWARF builds !endif !else - !if $(TOOL_CHAIN_TAG) in "VS2019 VS2022" + !if $(TOOL_CHAIN_TAG) in "VS2019 VS2022 VS2026" !error EmulatorPkg not supported for Linux/VS20xx builds !endif !if $(TOOL_CHAIN_TAG) in "CLANGPDB" diff --git a/EmulatorPkg/Readme.md b/EmulatorPkg/Readme.md index 1cf267c92f..4135bc46b1 100644 --- a/EmulatorPkg/Readme.md +++ b/EmulatorPkg/Readme.md @@ -21,11 +21,11 @@ https://github.com/tianocore/tianocore.github.io/wiki/EmulatorPkg **You can use the following command to build.** * 32bit emulator in Windows: - `build -p EmulatorPkg\EmulatorPkg.dsc -t VS2022 -a IA32` + `build -p EmulatorPkg\EmulatorPkg.dsc -t VS2026 -a IA32` * 64bit emulator in Windows: - `build -p EmulatorPkg\EmulatorPkg.dsc -t VS2022 -a X64` + `build -p EmulatorPkg\EmulatorPkg.dsc -t VS2026 -a X64` * 32bit emulator in Linux: @@ -38,11 +38,11 @@ https://github.com/tianocore/tianocore.github.io/wiki/EmulatorPkg **You can start/run the emulator using the following command:** * 32bit emulator in Windows: - `cd Build\EmulatorIA32\DEBUG_VS2022\IA32\ && WinHost.exe` + `cd Build\EmulatorIA32\DEBUG_VS2026\IA32\ && WinHost.exe` * 64bit emulator in Windows: - `cd Build\EmulatorX64\DEBUG_VS2022\X64\ && WinHost.exe` + `cd Build\EmulatorX64\DEBUG_VS2026\X64\ && WinHost.exe` * 32bit emulator in Linux: