Skip to content

Commit 031b848

Browse files
authored
Merge pull request #36213 from compnerd/5.4-sdk-updates
Update WinSDK module for latest changes
2 parents 89dee97 + 5e9836c commit 031b848

File tree

1 file changed

+82
-0
lines changed

1 file changed

+82
-0
lines changed

stdlib/public/Platform/winsdk.modulemap

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,11 @@ module WinSDK [system] {
139139
}
140140
}
141141

142+
module ActiveX {
143+
header "OCIdl.h"
144+
export *
145+
}
146+
142147
module Controls {
143148
module CommCtrl {
144149
header "CommCtrl.h"
@@ -153,6 +158,67 @@ module WinSDK [system] {
153158
}
154159
}
155160

161+
explicit module DirectX {
162+
module Direct3D11 {
163+
header "d3d11.h"
164+
header "d3d11_1.h"
165+
header "d3d11_2.h"
166+
header "d3d11_3.h"
167+
header "d3d11_4.h"
168+
export *
169+
170+
link "d3d11.lib"
171+
link "dxgi.lib"
172+
}
173+
174+
module Direct3D12 {
175+
header "d3d12.h"
176+
export *
177+
178+
link "d3d12.lib"
179+
link "dxgi.lib"
180+
}
181+
182+
// FIXME(compnerd) DXGI is part of the Direct3D interfaces currently; we
183+
// should split it out, but because it is part of the D3D11 interfaces, this
184+
// separate module is meant to augment the uncovered portions only.
185+
module _DXGI {
186+
header "../shared/dxgi1_6.h"
187+
header "dxgidebug.h"
188+
export *
189+
190+
link "dxgi.lib"
191+
}
192+
193+
module D3DCompiler {
194+
header "d3dcompiler.h"
195+
export *
196+
197+
link "d3dcompiler.lib"
198+
}
199+
200+
module XAudio29 {
201+
header "xaudio2.h"
202+
header "xaudio2fx.h"
203+
export *
204+
205+
link "xaudio2.lib"
206+
207+
requires cplusplus
208+
}
209+
210+
// XInput 1.4 (Windows 10, XBox) is newer than the XInput 9.1.0 which was
211+
// part of Vista.
212+
module XInput14 {
213+
header "Xinput.h"
214+
export *
215+
216+
link "xinput.lib"
217+
}
218+
219+
link "dxguid.lib"
220+
}
221+
156222
// FIXME(compnerd) this is a hack for the HWND typedef for DbgHelp
157223
module __DirectX {
158224
header "directmanipulation.h"
@@ -343,6 +409,15 @@ module WinSDK [system] {
343409
link "sensorsapi.lib"
344410
}
345411

412+
module UI {
413+
module XAML {
414+
module Hosting {
415+
header "windows.ui.xaml.hosting.desktopwindowxamlsource.h"
416+
export *
417+
}
418+
}
419+
}
420+
346421
module User {
347422
header "WinUser.h"
348423
export *
@@ -401,6 +476,13 @@ module WinSDK [system] {
401476
link "AdvAPI32.Lib"
402477
}
403478

479+
module WinSafer {
480+
header "winsafer.h"
481+
export *
482+
483+
link "AdvAPI32.Lib"
484+
}
485+
404486
// TODO(compnerd) does it make sense to implicitly export this API surface?
405487
// It seems to be meant for device drivers.
406488
module WLANAPI {

0 commit comments

Comments
 (0)