From a0a03760cd037016914bea1f4ee6a33fd767cfa4 Mon Sep 17 00:00:00 2001 From: ge0rdi Date: Sat, 19 Nov 2022 20:54:21 +0100 Subject: [PATCH] Build: Fix source indexing x64 version of pdbstr doesn't work (because of missing __CxxFrameHandler4 on Windows Server 2019). Fortunately it seems that x86 version works well, so we can use that one. --- Src/Setup/BuildBinaries.bat | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Src/Setup/BuildBinaries.bat b/Src/Setup/BuildBinaries.bat index f1f8149..ec0648d 100644 --- a/Src/Setup/BuildBinaries.bat +++ b/Src/Setup/BuildBinaries.bat @@ -114,7 +114,7 @@ copy /B Output\x64\StartMenuHelper64.dll Output\PDB64 > nul REM ********* Source Index PDBs -set PDBSTR_PATH="C:\Program Files (x86)\Windows Kits\10\Debuggers\x64\srcsrv\pdbstr.exe" +set PDBSTR_PATH="C:\Program Files (x86)\Windows Kits\10\Debuggers\x86\srcsrv\pdbstr.exe" if exist %PDBSTR_PATH% ( echo --- Adding source index to PDBs @@ -122,10 +122,18 @@ if exist %PDBSTR_PATH% ( for %%f in (Output\PDB32\*.pdb) do ( %PDBSTR_PATH% -w -p:%%f -s:srcsrv -i:Output\pdbstr.txt + if not ERRORLEVEL 0 ( + echo Error adding source index to PDB + exit /b 1 + ) ) for %%f in (Output\PDB64\*.pdb) do ( %PDBSTR_PATH% -w -p:%%f -s:srcsrv -i:Output\pdbstr.txt + if not ERRORLEVEL 0 ( + echo Error adding source index to PDB + exit /b 1 + ) ) )