Skip to content

Commit 83bb1c4

Browse files
committed
WiX: package up static libraries for static SDK
Package up the static library dependencies that are required for FoundationNetworking, FoundationXML. These are packaged with the experimental SDK as they are required only for static linking.
1 parent cf51c4c commit 83bb1c4

File tree

1 file changed

+44
-0
lines changed

1 file changed

+44
-0
lines changed

platforms/Windows/platforms/windows/windows.wxs

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3024,6 +3024,47 @@
30243024
</ComponentGroup>
30253025
<?endif?>
30263026

3027+
<!-- Foundation Dependencies -->
3028+
<?if $(IncludeARM64) = True?>
3029+
<ComponentGroup Id="FoundationDependencies.arm64" Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_arm64">
3030+
<Component>
3031+
<File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\aarch64\libcurl.lib" />
3032+
</Component>
3033+
<Component>
3034+
<File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\aarch64\libxml2s.lib" />
3035+
</Component>
3036+
<Component>
3037+
<File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\aarch64\zlibstatic.lib" />
3038+
</Component>
3039+
</ComponentGroup>
3040+
<?endif?>
3041+
<?if $(IncludeX64) = True?>
3042+
<ComponentGroup Id="FoundationDependencies.x64" Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x64">
3043+
<Component>
3044+
<File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\x86_64\libcurl.lib" />
3045+
</Component>
3046+
<Component>
3047+
<File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\x86_64\libxml2s.lib" />
3048+
</Component>
3049+
<Component>
3050+
<File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\x86_64\zlibstatic.lib" />
3051+
</Component>
3052+
</ComponentGroup>
3053+
<?endif?>
3054+
<?if $(IncludeX86) = True?>
3055+
<ComponentGroup Id="FoundationDependencies.x86" Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x86">
3056+
<Component>
3057+
<File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\i686\libcurl.lib" />
3058+
</Component>
3059+
<Component>
3060+
<File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\i686\libxml2s.lib" />
3061+
</Component>
3062+
<Component>
3063+
<File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\i686\zlibstatic.lib" />
3064+
</Component>
3065+
</ComponentGroup>
3066+
<?endif?>
3067+
30273068
<!-- Observation -->
30283069
<?if $(IncludeLegacySDK) = True?>
30293070
<?if $(IncludeARM64) = True?>
@@ -4324,6 +4365,7 @@
43244365
<ComponentGroupRef Id="swiftDispatch.arm64" />
43254366

43264367
<ComponentGroupRef Id="CoreFoundation.arm64" />
4368+
<ComponentGroupRef Id="FoundationDependencies.arm64" />
43274369
<ComponentGroupRef Id="libBlocksRuntime.arm64" />
43284370
<ComponentGroupRef Id="libCRT.arm64" />
43294371
<ComponentGroupRef Id="libCxx.arm64" />
@@ -4394,6 +4436,7 @@
43944436
<ComponentGroupRef Id="swiftDispatch.x64" />
43954437

43964438
<ComponentGroupRef Id="CoreFoundation.x64" />
4439+
<ComponentGroupRef Id="FoundationDependencies.x64" />
43974440
<ComponentGroupRef Id="libBlocksRuntime.x64" />
43984441
<ComponentGroupRef Id="libCRT.x64" />
43994442
<ComponentGroupRef Id="libCxx.x64" />
@@ -4464,6 +4507,7 @@
44644507
<ComponentGroupRef Id="swiftDispatch.x86" />
44654508

44664509
<ComponentGroupRef Id="CoreFoundation.x86" />
4510+
<ComponentGroupRef Id="FoundationDependencies.x86" />
44674511
<ComponentGroupRef Id="libBlocksRuntime.x86" />
44684512
<ComponentGroupRef Id="libCRT.x86" />
44694513
<ComponentGroupRef Id="libCxx.x86" />

0 commit comments

Comments
 (0)