17
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-10-17 06:19:19 +02:00

let clang find the Windows SDK on its own

The failing chain showed the same directory reached two ways - one
spelling with doubled separators, one without - so #pragma once did not
recognise the file and the SDK headers were parsed twice: every COM
interface then looked like a uuid mismatch and BroadcastSystemMessageEx
like a conflicting redeclaration.

vcvars64 was putting the SDK in INCLUDE while clang was also locating it
itself. Dropped the vcvars call; clang's own detection is enough, and one
spelling means the include guards work.
This commit is contained in:
maj00r
2026-09-10 17:11:54 +02:00
parent 61b3ec6f3f
commit 63a66628f7

View File

@@ -82,12 +82,16 @@ jobs:
call setup.bat
# Ninja, not MSBuild: CMake's module dependency scanning is best supported
# there, and vcvars64 supplies the SDK and library paths clang needs.
# there.
#
# Deliberately not inside vcvars64. clang finds the MSVC toolchain and the
# Windows SDK by itself; letting vcvars also put them in INCLUDE gives the
# same directory two spellings, one of them with doubled separators, and
# #pragma once then fails to recognise the file - the SDK headers get
# parsed twice and every COM interface looks like a uuid mismatch.
- name: Configure
shell: cmd
run: |
for /f "usebackq tokens=*" %%i in (`"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -latest -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath`) do set VSPATH=%%i
call "%VSPATH%\VC\Auxiliary\Build\vcvars64.bat"
for %%p in ("${{ steps.python.outputs.python-path }}") do set "PYROOT=%%~dpp"
rem CMake writes these paths verbatim into its own .cmake files, where a
rem backslash starts an escape: "C:\Program Files" would be read as \P.
@@ -104,8 +108,6 @@ jobs:
- name: Build
shell: cmd
run: |
for /f "usebackq tokens=*" %%i in (`"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -latest -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath`) do set VSPATH=%%i
call "%VSPATH%\VC\Auxiliary\Build\vcvars64.bat"
cmake --build build --parallel
- name: Copy shaders