Virtualization/edk2
1
0
Fork 0
mirror of https://gitlab.com/qemu-project/edk2.git synced 2025-10-30 07:56:39 +08:00
Code Issues Projects Releases Wiki Activity

BaseTools: fix build error with TOOL_CHAIN_TAG VS2015 & VS2015x86

Browse Source 
Start the build with TOOL_CHAIN_TAG VS2015 by launch:
  Build -t VS2015

ERROR: Would get following build error message:
'c:\Program' is not recognized as an internal or external command,
operable program or batch file.
NMAKE : fatal error U1077: '"c:\Program Files\Windows Kits\8.1\bin\x86\\rc.exe' : return code '0x1'
Stop.

Fix the build error,
Tested :
  TOOL_CHAIN_TAG = VS2015    (>Build -t VS2015)
  TOOL_CHAIN_TAG = VS2015x86 (>Build -t VS2015x86)

Signed-off-by: wilson_chen <wilson_chen@phoenix.com>
This commit is contained in:
wilson_chen
2024-07-26 17:31:46 +08:00
committed by mergify[bot]
parent 621a30c676
commit 91a822749a
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
BaseTools/Conf/tools_def.template
View File

@ -67,8 +67,8 @@ DEFINE WINSDK_BIN = ENV(WINSDK_PREFIX)
DEFINE WINSDKx86_BIN = ENV(WINSDKx86_PREFIX)
# Microsoft Visual Studio 2015 Professional Edition
DEFINE WINSDK81_BIN = ENV(WINSDK81_PREFIX)x86\
DEFINE WINSDK81x86_BIN = ENV(WINSDK81x86_PREFIX)x64
DEFINE WINSDK81_BIN = ENV(WINSDK81_PREFIX)x64
DEFINE WINSDK81x86_BIN = ENV(WINSDK81x86_PREFIX)x86
# Microsoft Visual Studio 2017/2019/2022 Professional Edition
DEFINE WINSDK10_BIN = ENV(WINSDK10_PREFIX)DEF(VS_HOST)

12
BaseTools/set_vsprefix_envs.bat
View File

@ -35,10 +35,18 @@ if defined VS140COMNTOOLS (
set "VS2015_PREFIX=%VS140COMNTOOLS:~0,-14%"
)
if not defined WINSDK81_PREFIX (
set "WINSDK81_PREFIX=c:\Program Files\Windows Kits\8.1\bin\"
if exist "%ProgramFiles%\Windows Kits\8.1\bin" (
set "WINSDK81_PREFIX=%ProgramFiles%\Windows Kits\8.1\bin\"
) else if exist "%ProgramFiles(x86)%\Windows Kits\8.1\bin" (
set "WINSDK81_PREFIX=%ProgramFiles(x86)%\Windows Kits\8.1\bin\"
)
)
if not defined WINSDK81x86_PREFIX (
set "WINSDK81x86_PREFIX=c:\Program Files (x86)\Windows Kits\8.1\bin\"
if exist "%ProgramFiles(x86)%\Windows Kits\8.1\bin" (
set "WINSDK81x86_PREFIX=%ProgramFiles(x86)%\Windows Kits\8.1\bin\"
) else if exist "%ProgramFiles%\Windows Kits\8.1\bin" (
set "WINSDK81x86_PREFIX=%ProgramFiles%\Windows Kits\8.1\bin\"
)
)
) else (
if /I "%1"=="VS2015" goto ToolNotInstall