Skip to content

Commit 6296cde

Browse files
itsmikethetechitsmikethetech
committed
fix(ci): discover IddCx paths on GitHub runners
Resolve the WDK header and library directories from the actual runner installation so CI does not assume a single Windows Kits layout. This lets the project consume those overrides for x64 and ARM64 so the indirect display headers and stub libraries stay aligned in CI. Made-with: Cursor
1 parent bea5a23 commit 6296cde

2 files changed

Lines changed: 84 additions & 14 deletions

File tree

‎.github/workflows/ci-validation.yml‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,14 +112,74 @@ jobs:
112112
$umdfMinor = ($umdfBest.Name -split '\.')[1]
113113
Write-Output "Using UMDF version: $($umdfBest.Name) (minor=$umdfMinor) from $($umdfBest.FullName)"
114114
115+
function Get-VersionOrZero([string]$value) {
116+
try {
117+
return [version]$value
118+
} catch {
119+
return [version]"0.0"
120+
}
121+
}
122+
123+
$platformLibSegment = switch ("${{ matrix.platform }}") {
124+
"x64" { "x64" }
125+
"ARM64" { "arm64" }
126+
"ARM" { "arm" }
127+
default { "${{ matrix.platform }}".ToLowerInvariant() }
128+
}
129+
130+
$iddcxInclude =
131+
Get-ChildItem -Path (Join-Path $env:WINDOWS_SDK_DIR "Include") -Recurse -Filter "IddCx.h" -ErrorAction SilentlyContinue |
132+
Where-Object { $_.DirectoryName -match '\\iddcx\\\d+\.\d+$' } |
133+
Sort-Object -Property `
134+
@{ Expression = { Get-VersionOrZero ([regex]::Match($_.FullName, '\\(\d+\.\d+\.\d+\.\d+)\\').Groups[1].Value) }; Descending = $true }, `
135+
@{ Expression = { Get-VersionOrZero $_.Directory.Name }; Descending = $true } |
136+
Select-Object -First 1
137+
138+
if (-not $iddcxInclude) {
139+
throw "IddCx include directory not found anywhere under $env:WINDOWS_SDK_DIR\Include"
140+
}
141+
142+
$iddcxLibPattern = "\\um\\" + [regex]::Escape($platformLibSegment) + "\\iddcx\\\d+\.\d+$"
143+
$iddcxLib =
144+
Get-ChildItem -Path (Join-Path $env:WINDOWS_SDK_DIR "Lib") -Recurse -Filter "IddCxStub.lib" -ErrorAction SilentlyContinue |
145+
Where-Object { $_.DirectoryName -match $iddcxLibPattern } |
146+
Sort-Object -Property `
147+
@{ Expression = { Get-VersionOrZero ([regex]::Match($_.FullName, '\\(\d+\.\d+\.\d+\.\d+)\\').Groups[1].Value) }; Descending = $true }, `
148+
@{ Expression = { Get-VersionOrZero $_.Directory.Name }; Descending = $true } |
149+
Select-Object -First 1
150+
151+
if (-not $iddcxLib) {
152+
throw "IddCxStub.lib not found for platform $platformLibSegment anywhere under $env:WINDOWS_SDK_DIR\Lib"
153+
}
154+
155+
$baseUmLibPattern = "\\um\\" + [regex]::Escape($platformLibSegment) + "$"
156+
$baseUmLib =
157+
Get-ChildItem -Path (Join-Path $env:WINDOWS_SDK_DIR "Lib") -Recurse -Filter "wpprecorderum.lib" -ErrorAction SilentlyContinue |
158+
Where-Object { $_.DirectoryName -match $baseUmLibPattern } |
159+
Sort-Object -Property `
160+
@{ Expression = { Get-VersionOrZero ([regex]::Match($_.FullName, '\\(\d+\.\d+\.\d+\.\d+)\\').Groups[1].Value) }; Descending = $true } |
161+
Select-Object -First 1
162+
163+
if (-not $baseUmLib) {
164+
throw "Base UM library directory not found for platform $platformLibSegment under $env:WINDOWS_SDK_DIR\Lib"
165+
}
166+
167+
Write-Output "Using IddCx include: $($iddcxInclude.Directory.FullName)"
168+
Write-Output "Using IddCx lib: $($iddcxLib.Directory.FullName)"
169+
Write-Output "Using base UM lib dir: $($baseUmLib.Directory.FullName)"
170+
115171
msbuild $sln `
116172
/m `
117173
/t:Build `
118174
/p:Configuration="${{ env.BUILD_CONFIGURATION }}" `
119175
/p:Platform="${{ matrix.platform }}" `
120176
/p:WindowsSdkDir="$env:WINDOWS_SDK_DIR" `
121177
/p:WindowsTargetPlatformVersion="$env:WINDOWS_TARGET_PLATFORM_VERSION" `
178+
/p:TargetPlatformVersion="$env:WINDOWS_TARGET_PLATFORM_VERSION" `
122179
/p:UMDF_VERSION_MINOR="$umdfMinor" `
180+
/p:VddIddCxIncludeDir="$($iddcxInclude.Directory.FullName)" `
181+
/p:VddIddCxLibDir="$($iddcxLib.Directory.FullName)" `
182+
/p:VddBaseUmLibDir="$($baseUmLib.Directory.FullName)" `
123183
/p:EnableInfVerif=false `
124184
/p:RunApiValidator=false `
125185
/verbosity:minimal

‎Virtual Display Driver (HDR)/MttVDD/MttVDD.vcxproj‎

Lines changed: 24 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,16 @@
175175
<UMDF_VERSION_MINOR>25</UMDF_VERSION_MINOR>
176176
<UMDF_MINIMUM_VERSION_REQUIRED>25</UMDF_MINIMUM_VERSION_REQUIRED>
177177
</PropertyGroup>
178+
<PropertyGroup Label="SdkPathResolution">
179+
<VddTargetPlatformVersion Condition="'$(VddTargetPlatformVersion)' == '' and '$(TargetPlatformVersion)' != ''">$(TargetPlatformVersion)</VddTargetPlatformVersion>
180+
<VddTargetPlatformVersion Condition="'$(VddTargetPlatformVersion)' == '' and '$(WindowsTargetPlatformVersion)' != ''">$(WindowsTargetPlatformVersion)</VddTargetPlatformVersion>
181+
<VddIddCxIncludeDir Condition="'$(VddIddCxIncludeDir)' == '' and '$(VddTargetPlatformVersion)' != '' and Exists('$(WindowsSdkDir)Include\$(VddTargetPlatformVersion)\um\iddcx\$(IDDCX_VERSION_MAJOR).$(IDDCX_VERSION_MINOR)\IddCx.h')">$(WindowsSdkDir)Include\$(VddTargetPlatformVersion)\um\iddcx\$(IDDCX_VERSION_MAJOR).$(IDDCX_VERSION_MINOR)</VddIddCxIncludeDir>
182+
<VddIddCxIncludeDir Condition="'$(VddIddCxIncludeDir)' == '' and Exists('$(WindowsSdkDir)Include\10.0.26100.0\um\iddcx\$(IDDCX_VERSION_MAJOR).$(IDDCX_VERSION_MINOR)\IddCx.h')">$(WindowsSdkDir)Include\10.0.26100.0\um\iddcx\$(IDDCX_VERSION_MAJOR).$(IDDCX_VERSION_MINOR)</VddIddCxIncludeDir>
183+
<VddIddCxLibDir Condition="'$(VddIddCxLibDir)' == '' and '$(VddTargetPlatformVersion)' != '' and Exists('$(WindowsSdkDir)Lib\$(VddTargetPlatformVersion)\um\$(Platform)\iddcx\$(IDDCX_VERSION_MAJOR).$(IDDCX_VERSION_MINOR)\IddCxStub.lib')">$(WindowsSdkDir)Lib\$(VddTargetPlatformVersion)\um\$(Platform)\iddcx\$(IDDCX_VERSION_MAJOR).$(IDDCX_VERSION_MINOR)</VddIddCxLibDir>
184+
<VddIddCxLibDir Condition="'$(VddIddCxLibDir)' == '' and Exists('$(WindowsSdkDir)Lib\10.0.26100.0\um\$(Platform)\iddcx\$(IDDCX_VERSION_MAJOR).$(IDDCX_VERSION_MINOR)\IddCxStub.lib')">$(WindowsSdkDir)Lib\10.0.26100.0\um\$(Platform)\iddcx\$(IDDCX_VERSION_MAJOR).$(IDDCX_VERSION_MINOR)</VddIddCxLibDir>
185+
<VddBaseUmLibDir Condition="'$(VddBaseUmLibDir)' == '' and '$(VddTargetPlatformVersion)' != '' and Exists('$(WindowsSdkDir)Lib\$(VddTargetPlatformVersion)\um\$(Platform)\wpprecorderum.lib')">$(WindowsSdkDir)Lib\$(VddTargetPlatformVersion)\um\$(Platform)</VddBaseUmLibDir>
186+
<VddBaseUmLibDir Condition="'$(VddBaseUmLibDir)' == '' and Exists('$(WindowsSdkDir)Lib\10.0.26100.0\um\$(Platform)\wpprecorderum.lib')">$(WindowsSdkDir)Lib\10.0.26100.0\um\$(Platform)</VddBaseUmLibDir>
187+
</PropertyGroup>
178188
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
179189
<ImportGroup Label="ExtensionSettings">
180190
</ImportGroup>
@@ -255,12 +265,12 @@
255265
<ExceptionHandling>Async</ExceptionHandling>
256266
<EnablePREfast>true</EnablePREfast>
257267
<AdditionalOptions>/D_ATL_NO_WIN_SUPPORT /DUMDF_DRIVER /DIDDCX_VERSION_MAJOR=1 /DIDDCX_VERSION_MINOR=4 /DIDDCX_MINIMUM_VERSION_REQUIRED=4 %(AdditionalOptions)</AdditionalOptions>
258-
<AdditionalIncludeDirectories>$(WindowsSdkDir)Include\wdf\umdf\$(UMDF_VERSION_MAJOR).$(UMDF_VERSION_MINOR);$(WindowsSdkDir)Include\$(TargetPlatformVersion)\wdf\umdf\$(UMDF_VERSION_MAJOR).$(UMDF_VERSION_MINOR);$(ProjectDir)..\..\ThirdParty\Windows-Driver-Frameworks\src\publicinc\wdf\umdf\2.15;$(ProjectDir)..\..\Common\Include;$(WindowsSdkDir)Include\10.0.26100.0\um\iddcx\$(IDDCX_VERSION_MAJOR).$(IDDCX_VERSION_MINOR);$(WindowsSdkDir)Include\$(TargetPlatformVersion)\um\iddcx\$(IDDCX_VERSION_MAJOR).$(IDDCX_VERSION_MINOR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
268+
<AdditionalIncludeDirectories>$(WindowsSdkDir)Include\wdf\umdf\$(UMDF_VERSION_MAJOR).$(UMDF_VERSION_MINOR);$(WindowsSdkDir)Include\$(VddTargetPlatformVersion)\wdf\umdf\$(UMDF_VERSION_MAJOR).$(UMDF_VERSION_MINOR);$(ProjectDir)..\..\ThirdParty\Windows-Driver-Frameworks\src\publicinc\wdf\umdf\2.15;$(ProjectDir)..\..\Common\Include;$(VddIddCxIncludeDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
259269
<LanguageStandard>stdcpp17</LanguageStandard>
260270
</ClCompile>
261271
<Link>
262272
<AdditionalDependencies>%(AdditionalDependencies);OneCoreUAP.lib;avrt.lib;setupapi.lib;ntdll.lib;WdfDriverStubUm.lib;IddCxStub.lib;wpprecorderum.lib;d3dcompiler.lib</AdditionalDependencies>
263-
<AdditionalLibraryDirectories>$(WindowsSdkDir)Lib\10.0.26100.0\um\$(PlatformTarget);$(WindowsSdkDir)Lib\wdf\umdf\$(PlatformTarget)\$(UMDF_VERSION_MAJOR).$(UMDF_VERSION_MINOR);$(WindowsSdkDir)Lib\10.0.26100.0\um\$(PlatformTarget)\iddcx\$(IDDCX_VERSION_MAJOR).$(IDDCX_VERSION_MINOR);$(WindowsSdkDir)Lib\$(TargetPlatformVersion)\um\$(PlatformTarget)\iddcx\$(IDDCX_VERSION_MAJOR).$(IDDCX_VERSION_MINOR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
273+
<AdditionalLibraryDirectories>$(VddBaseUmLibDir);$(WindowsSdkDir)Lib\wdf\umdf\$(PlatformTarget)\$(UMDF_VERSION_MAJOR).$(UMDF_VERSION_MINOR);$(VddIddCxLibDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
264274
</Link>
265275
<DriverSign>
266276
<FileDigestAlgorithm>SHA1</FileDigestAlgorithm>
@@ -284,12 +294,12 @@ xcopy /Y /I /Q "$(ProjectDir)..\..\Common\Include\Shaders\*.hlsl" "$(TargetDir)M
284294
<ExceptionHandling>Async</ExceptionHandling>
285295
<EnablePREfast>true</EnablePREfast>
286296
<AdditionalOptions>/D_ATL_NO_WIN_SUPPORT /DUMDF_DRIVER /DIDDCX_VERSION_MAJOR=1 /DIDDCX_VERSION_MINOR=10 /DIDDCX_MINIMUM_VERSION_REQUIRED=3 %(AdditionalOptions)</AdditionalOptions>
287-
<AdditionalIncludeDirectories>$(WindowsSdkDir)Include\wdf\umdf\$(UMDF_VERSION_MAJOR).$(UMDF_VERSION_MINOR);$(WindowsSdkDir)Include\$(TargetPlatformVersion)\wdf\umdf\$(UMDF_VERSION_MAJOR).$(UMDF_VERSION_MINOR);$(ProjectDir)..\..\ThirdParty\Windows-Driver-Frameworks\src\publicinc\wdf\umdf\2.15;$(ProjectDir)..\..\Common\Include;$(WindowsSdkDir)Include\10.0.26100.0\um\iddcx\$(IDDCX_VERSION_MAJOR).$(IDDCX_VERSION_MINOR);$(WindowsSdkDir)Include\$(TargetPlatformVersion)\um\iddcx\$(IDDCX_VERSION_MAJOR).$(IDDCX_VERSION_MINOR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
297+
<AdditionalIncludeDirectories>$(WindowsSdkDir)Include\wdf\umdf\$(UMDF_VERSION_MAJOR).$(UMDF_VERSION_MINOR);$(WindowsSdkDir)Include\$(VddTargetPlatformVersion)\wdf\umdf\$(UMDF_VERSION_MAJOR).$(UMDF_VERSION_MINOR);$(ProjectDir)..\..\ThirdParty\Windows-Driver-Frameworks\src\publicinc\wdf\umdf\2.15;$(ProjectDir)..\..\Common\Include;$(VddIddCxIncludeDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
288298
<LanguageStandard>stdcpp17</LanguageStandard>
289299
</ClCompile>
290300
<Link>
291301
<AdditionalDependencies>%(AdditionalDependencies);OneCoreUAP.lib;avrt.lib;setupapi.lib;ntdll.lib;WdfDriverStubUm.lib;IddCxStub.lib;wpprecorderum.lib;d3dcompiler.lib</AdditionalDependencies>
292-
<AdditionalLibraryDirectories>$(WindowsSdkDir)Lib\10.0.26100.0\um\$(PlatformTarget);$(WindowsSdkDir)Lib\wdf\umdf\$(PlatformTarget)\$(UMDF_VERSION_MAJOR).$(UMDF_VERSION_MINOR);$(WindowsSdkDir)Lib\10.0.26100.0\um\$(PlatformTarget)\iddcx\$(IDDCX_VERSION_MAJOR).$(IDDCX_VERSION_MINOR);$(WindowsSdkDir)Lib\$(TargetPlatformVersion)\um\$(PlatformTarget)\iddcx\$(IDDCX_VERSION_MAJOR).$(IDDCX_VERSION_MINOR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
302+
<AdditionalLibraryDirectories>$(VddBaseUmLibDir);$(WindowsSdkDir)Lib\wdf\umdf\$(PlatformTarget)\$(UMDF_VERSION_MAJOR).$(UMDF_VERSION_MINOR);$(VddIddCxLibDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
293303
</Link>
294304
<DriverSign>
295305
<FileDigestAlgorithm>SHA256</FileDigestAlgorithm>
@@ -314,8 +324,8 @@ xcopy /Y /I /Q "$(ProjectDir)..\..\Common\Include\Shaders\*.hlsl" "$(TargetDir)M
314324
<EnablePREfast>true</EnablePREfast>
315325
</ClCompile>
316326
<Link>
317-
<AdditionalDependencies>%(AdditionalDependencies);OneCoreUAP.lib;avrt.lib;setupapi.lib;WdfDriverStubUm.lib;IddCxStub.lib;wpprecorderum.lib;d3dcompiler.lib</AdditionalDependencies>
318-
<AdditionalLibraryDirectories>$(WindowsSdkDir)Lib\wdf\umdf\$(PlatformTarget)\$(UMDF_VERSION_MAJOR).$(UMDF_VERSION_MINOR);$(WindowsSdkDir)Lib\10.0.26100.0\um\$(PlatformTarget)\iddcx\$(IDDCX_VERSION_MAJOR).$(IDDCX_VERSION_MINOR);$(WindowsSdkDir)Lib\$(TargetPlatformVersion)\um\$(PlatformTarget)\iddcx\$(IDDCX_VERSION_MAJOR).$(IDDCX_VERSION_MINOR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
327+
<AdditionalDependencies>%(AdditionalDependencies);OneCoreUAP.lib;avrt.lib;setupapi.lib;ntdll.lib;WdfDriverStubUm.lib;IddCxStub.lib;wpprecorderum.lib;d3dcompiler.lib</AdditionalDependencies>
328+
<AdditionalLibraryDirectories>$(VddBaseUmLibDir);$(WindowsSdkDir)Lib\wdf\umdf\$(PlatformTarget)\$(UMDF_VERSION_MAJOR).$(UMDF_VERSION_MINOR);$(VddIddCxLibDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
319329
</Link>
320330
</ItemDefinitionGroup>
321331
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
@@ -327,8 +337,8 @@ xcopy /Y /I /Q "$(ProjectDir)..\..\Common\Include\Shaders\*.hlsl" "$(TargetDir)M
327337
<EnablePREfast>true</EnablePREfast>
328338
</ClCompile>
329339
<Link>
330-
<AdditionalDependencies>%(AdditionalDependencies);OneCoreUAP.lib;avrt.lib;setupapi.lib;WdfDriverStubUm.lib;IddCxStub.lib;wpprecorderum.lib;d3dcompiler.lib</AdditionalDependencies>
331-
<AdditionalLibraryDirectories>$(WindowsSdkDir)Lib\wdf\umdf\$(PlatformTarget)\$(UMDF_VERSION_MAJOR).$(UMDF_VERSION_MINOR);$(WindowsSdkDir)Lib\10.0.26100.0\um\$(PlatformTarget)\iddcx\$(IDDCX_VERSION_MAJOR).$(IDDCX_VERSION_MINOR);$(WindowsSdkDir)Lib\$(TargetPlatformVersion)\um\$(PlatformTarget)\iddcx\$(IDDCX_VERSION_MAJOR).$(IDDCX_VERSION_MINOR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
340+
<AdditionalDependencies>%(AdditionalDependencies);OneCoreUAP.lib;avrt.lib;setupapi.lib;ntdll.lib;WdfDriverStubUm.lib;IddCxStub.lib;wpprecorderum.lib;d3dcompiler.lib</AdditionalDependencies>
341+
<AdditionalLibraryDirectories>$(VddBaseUmLibDir);$(WindowsSdkDir)Lib\wdf\umdf\$(PlatformTarget)\$(UMDF_VERSION_MAJOR).$(UMDF_VERSION_MINOR);$(VddIddCxLibDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
332342
</Link>
333343
</ItemDefinitionGroup>
334344
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
@@ -339,12 +349,12 @@ xcopy /Y /I /Q "$(ProjectDir)..\..\Common\Include\Shaders\*.hlsl" "$(TargetDir)M
339349
<ExceptionHandling>Async</ExceptionHandling>
340350
<EnablePREfast>true</EnablePREfast>
341351
<AdditionalOptions>/D_ATL_NO_WIN_SUPPORT /DUMDF_DRIVER /DIDDCX_VERSION_MAJOR=1 /DIDDCX_VERSION_MINOR=4 /DIDDCX_MINIMUM_VERSION_REQUIRED=4 %(AdditionalOptions)</AdditionalOptions>
342-
<AdditionalIncludeDirectories>$(WindowsSdkDir)Include\wdf\umdf\$(UMDF_VERSION_MAJOR).$(UMDF_VERSION_MINOR);$(WindowsSdkDir)Include\$(TargetPlatformVersion)\wdf\umdf\$(UMDF_VERSION_MAJOR).$(UMDF_VERSION_MINOR);$(ProjectDir)..\..\ThirdParty\Windows-Driver-Frameworks\src\publicinc\wdf\umdf\2.15;$(ProjectDir)..\..\Common\Include;$(WindowsSdkDir)Include\10.0.26100.0\um\iddcx\$(IDDCX_VERSION_MAJOR).$(IDDCX_VERSION_MINOR);$(WindowsSdkDir)Include\$(TargetPlatformVersion)\um\iddcx\$(IDDCX_VERSION_MAJOR).$(IDDCX_VERSION_MINOR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
352+
<AdditionalIncludeDirectories>$(WindowsSdkDir)Include\wdf\umdf\$(UMDF_VERSION_MAJOR).$(UMDF_VERSION_MINOR);$(WindowsSdkDir)Include\$(VddTargetPlatformVersion)\wdf\umdf\$(UMDF_VERSION_MAJOR).$(UMDF_VERSION_MINOR);$(ProjectDir)..\..\ThirdParty\Windows-Driver-Frameworks\src\publicinc\wdf\umdf\2.15;$(ProjectDir)..\..\Common\Include;$(VddIddCxIncludeDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
343353
<LanguageStandard>stdcpp17</LanguageStandard>
344354
</ClCompile>
345355
<Link>
346-
<AdditionalDependencies>%(AdditionalDependencies);OneCoreUAP.lib;avrt.lib;setupapi.lib;WdfDriverStubUm.lib;IddCxStub.lib;wpprecorderum.lib;d3dcompiler.lib</AdditionalDependencies>
347-
<AdditionalLibraryDirectories>$(WindowsSdkDir)Lib\wdf\umdf\$(PlatformTarget)\$(UMDF_VERSION_MAJOR).$(UMDF_VERSION_MINOR);$(WindowsSdkDir)Lib\10.0.26100.0\um\$(PlatformTarget)\iddcx\$(IDDCX_VERSION_MAJOR).$(IDDCX_VERSION_MINOR);$(WindowsSdkDir)Lib\$(TargetPlatformVersion)\um\$(PlatformTarget)\iddcx\$(IDDCX_VERSION_MAJOR).$(IDDCX_VERSION_MINOR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
356+
<AdditionalDependencies>%(AdditionalDependencies);OneCoreUAP.lib;avrt.lib;setupapi.lib;ntdll.lib;WdfDriverStubUm.lib;IddCxStub.lib;wpprecorderum.lib;d3dcompiler.lib</AdditionalDependencies>
357+
<AdditionalLibraryDirectories>$(VddBaseUmLibDir);$(WindowsSdkDir)Lib\wdf\umdf\$(PlatformTarget)\$(UMDF_VERSION_MAJOR).$(UMDF_VERSION_MINOR);$(VddIddCxLibDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
348358
</Link>
349359
<DriverSign>
350360
<FileDigestAlgorithm>SHA1</FileDigestAlgorithm>
@@ -371,12 +381,12 @@ xcopy /Y /I /Q "$(ProjectDir)..\..\Common\Include\Shaders\*.hlsl" "$(TargetDir)M
371381
<ExceptionHandling>Async</ExceptionHandling>
372382
<EnablePREfast>true</EnablePREfast>
373383
<AdditionalOptions>/D_ATL_NO_WIN_SUPPORT /DUMDF_DRIVER /DIDDCX_VERSION_MAJOR=1 /DIDDCX_VERSION_MINOR=10 /DIDDCX_MINIMUM_VERSION_REQUIRED=3 %(AdditionalOptions)</AdditionalOptions>
374-
<AdditionalIncludeDirectories>$(WindowsSdkDir)Include\wdf\umdf\$(UMDF_VERSION_MAJOR).$(UMDF_VERSION_MINOR);$(WindowsSdkDir)Include\$(TargetPlatformVersion)\wdf\umdf\$(UMDF_VERSION_MAJOR).$(UMDF_VERSION_MINOR);$(ProjectDir)..\..\ThirdParty\Windows-Driver-Frameworks\src\publicinc\wdf\umdf\2.15;$(ProjectDir)..\..\Common\Include;$(WindowsSdkDir)Include\10.0.26100.0\um\iddcx\$(IDDCX_VERSION_MAJOR).$(IDDCX_VERSION_MINOR);$(WindowsSdkDir)Include\$(TargetPlatformVersion)\um\iddcx\$(IDDCX_VERSION_MAJOR).$(IDDCX_VERSION_MINOR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
384+
<AdditionalIncludeDirectories>$(WindowsSdkDir)Include\wdf\umdf\$(UMDF_VERSION_MAJOR).$(UMDF_VERSION_MINOR);$(WindowsSdkDir)Include\$(VddTargetPlatformVersion)\wdf\umdf\$(UMDF_VERSION_MAJOR).$(UMDF_VERSION_MINOR);$(ProjectDir)..\..\ThirdParty\Windows-Driver-Frameworks\src\publicinc\wdf\umdf\2.15;$(ProjectDir)..\..\Common\Include;$(VddIddCxIncludeDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
375385
<LanguageStandard>stdcpp17</LanguageStandard>
376386
</ClCompile>
377387
<Link>
378-
<AdditionalDependencies>%(AdditionalDependencies);OneCoreUAP.lib;avrt.lib;setupapi.lib;WdfDriverStubUm.lib;IddCxStub.lib;wpprecorderum.lib;d3dcompiler.lib</AdditionalDependencies>
379-
<AdditionalLibraryDirectories>$(WindowsSdkDir)Lib\wdf\umdf\$(PlatformTarget)\$(UMDF_VERSION_MAJOR).$(UMDF_VERSION_MINOR);$(WindowsSdkDir)Lib\10.0.26100.0\um\$(PlatformTarget)\iddcx\$(IDDCX_VERSION_MAJOR).$(IDDCX_VERSION_MINOR);$(WindowsSdkDir)Lib\$(TargetPlatformVersion)\um\$(PlatformTarget)\iddcx\$(IDDCX_VERSION_MAJOR).$(IDDCX_VERSION_MINOR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
388+
<AdditionalDependencies>%(AdditionalDependencies);OneCoreUAP.lib;avrt.lib;setupapi.lib;ntdll.lib;WdfDriverStubUm.lib;IddCxStub.lib;wpprecorderum.lib;d3dcompiler.lib</AdditionalDependencies>
389+
<AdditionalLibraryDirectories>$(VddBaseUmLibDir);$(WindowsSdkDir)Lib\wdf\umdf\$(PlatformTarget)\$(UMDF_VERSION_MAJOR).$(UMDF_VERSION_MINOR);$(VddIddCxLibDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
380390
</Link>
381391
<DriverSign>
382392
<FileDigestAlgorithm>SHA256</FileDigestAlgorithm>

0 commit comments

Comments
 (0)