Merge pull request #70295 from STREGA/patch-1

DougGregor · web-flow · commit 3a7676c89f60 · 2023-12-07T14:14:32.000-08:00
Add DirectX WinSDK modulemap changes from main
diff --git a/stdlib/public/Platform/winsdk.modulemap b/stdlib/public/Platform/winsdk.modulemap
@@ -213,8 +213,6 @@ module WinSDK [system] {
       export *
 
       link "xaudio2.lib"
-
-      requires cplusplus
     }
 
     // XInput 1.4 (Windows 10, XBox) is newer than the XInput 9.1.0 which was
@@ -230,7 +228,7 @@ module WinSDK [system] {
       header "dinput.h"
       export *
 
-      link "dinput.lib"
+      link "dinput8.lib"
     }
 
     link "dxguid.lib"

Original file line number	Diff line number	Diff line change
`@@ -213,8 +213,6 @@ module WinSDK [system] {`
`213`	`213`	`export *`
`214`	`214`
`215`	`215`	`link "xaudio2.lib"`
`216`		`-`
`217`		`- requires cplusplus`
`218`	`216`	`}`
`219`	`217`
`220`	`218`	`// XInput 1.4 (Windows 10, XBox) is newer than the XInput 9.1.0 which was`
`@@ -230,7 +228,7 @@ module WinSDK [system] {`
`230`	`228`	`header "dinput.h"`
`231`	`229`	`export *`
`232`	`230`
`233`		`- link "dinput.lib"`
	`231`	`+ link "dinput8.lib"`
`234`	`232`	`}`
`235`	`233`
`236`	`234`	`link "dxguid.lib"`