Skip to content

[Windows SDK] Fix SwiftDispatch file references #412

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions platforms/Windows/platforms/windows/windows.wxs
Original file line number Diff line number Diff line change
Expand Up @@ -362,10 +362,10 @@
<?if $(IncludeARM64) = True?>
<ComponentGroup Id="libdispatch.arm64">
<Component Directory="Dispatch.swiftmodule" DiskId="2">
<File Source="$(SDKRoot)\usr\lib\swift\windows\Dispatch.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
<File Name="aarch64-unknown-windows-msvc.swiftdoc" Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\Dispatch.swiftdoc" />
</Component>
<Component Directory="Dispatch.swiftmodule" DiskId="2">
<File Source="$(SDKRoot)\usr\lib\swift\windows\Dispatch.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
<File Name="aarch64-unknown-windows-msvc.swiftmodule" Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\Dispatch.swiftmodule" />
</Component>

<Component Directory="WindowsSDK_usr_lib_swift_windows_arm64" DiskId="2">
Expand All @@ -379,10 +379,10 @@
<?if $(IncludeX64) = True?>
<ComponentGroup Id="libdispatch.x64">
<Component Directory="Dispatch.swiftmodule" DiskId="3">
<File Source="$(SDKRoot)\usr\lib\swift\windows\Dispatch.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
<File Name="x86_64-unknown-windows-msvc.swiftdoc" Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\Dispatch.swiftdoc" />
</Component>
<Component Directory="Dispatch.swiftmodule" DiskId="3">
<File Source="$(SDKRoot)\usr\lib\swift\windows\Dispatch.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
<File Name="x86_64-unknown-windows-msvc.swiftmodule" Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\Dispatch.swiftmodule" />
</Component>

<Component Directory="WindowsSDK_usr_lib_swift_windows_x64" DiskId="3">
Expand All @@ -396,10 +396,10 @@
<?if $(IncludeX86) = True?>
<ComponentGroup Id="libdispatch.x86">
<Component Directory="Dispatch.swiftmodule" DiskId="4">
<File Source="$(SDKRoot)\usr\lib\swift\windows\Dispatch.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
<File Name="i686-unknown-windows-msvc.swiftdoc" Source="$(SDKRoot)\usr\lib\swift\windows\i686\Dispatch.swiftdoc" />
</Component>
<Component Directory="Dispatch.swiftmodule" DiskId="4">
<File Source="$(SDKRoot)\usr\lib\swift\windows\Dispatch.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
<File Name="i686-unknown-windows-msvc.swiftmodule" Source="$(SDKRoot)\usr\lib\swift\windows\i686\Dispatch.swiftmodule" />
</Component>

<Component Directory="WindowsSDK_usr_lib_swift_windows_x86" DiskId="4">
Expand Down