Merge pull request #393 from compnerd/staged

WiX: adjust paths for C headers

Author: compnerd

platforms/Windows/sdk/CDispatch.wxi

@@ -1,45 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
   <Component>
-    <File Source="$(SDK_ROOT)\usr\lib\swift\dispatch\base.h" />
+    <File Source="$(SDK_ROOT)\usr\include\dispatch\base.h" />
   </Component>
   <Component>
-    <File Source="$(SDK_ROOT)\usr\lib\swift\dispatch\block.h" />
+    <File Source="$(SDK_ROOT)\usr\include\dispatch\block.h" />
   </Component>
   <Component>
-    <File Source="$(SDK_ROOT)\usr\lib\swift\dispatch\data.h" />
+    <File Source="$(SDK_ROOT)\usr\include\dispatch\data.h" />
   </Component>
   <Component>
-    <File Source="$(SDK_ROOT)\usr\lib\swift\dispatch\dispatch.h" />
+    <File Source="$(SDK_ROOT)\usr\include\dispatch\dispatch.h" />
   </Component>
   <Component>
-    <File Source="$(SDK_ROOT)\usr\lib\swift\dispatch\group.h" />
+    <File Source="$(SDK_ROOT)\usr\include\dispatch\group.h" />
   </Component>
   <Component>
-    <File Source="$(SDK_ROOT)\usr\lib\swift\dispatch\introspection.h" />
+    <File Source="$(SDK_ROOT)\usr\include\dispatch\introspection.h" />
   </Component>
   <Component>
-    <File Source="$(SDK_ROOT)\usr\lib\swift\dispatch\io.h" />
+    <File Source="$(SDK_ROOT)\usr\include\dispatch\io.h" />
   </Component>
   <Component>
-    <File Source="$(SDK_ROOT)\usr\lib\swift\dispatch\module.modulemap" />
+    <File Source="$(SDK_ROOT)\usr\include\dispatch\module.modulemap" />
   </Component>
   <Component>
-    <File Source="$(SDK_ROOT)\usr\lib\swift\dispatch\object.h" />
+    <File Source="$(SDK_ROOT)\usr\include\dispatch\object.h" />
   </Component>
   <Component>
-    <File Source="$(SDK_ROOT)\usr\lib\swift\dispatch\once.h" />
+    <File Source="$(SDK_ROOT)\usr\include\dispatch\once.h" />
   </Component>
   <Component>
-    <File Source="$(SDK_ROOT)\usr\lib\swift\dispatch\queue.h" />
+    <File Source="$(SDK_ROOT)\usr\include\dispatch\queue.h" />
   </Component>
   <Component>
-    <File Source="$(SDK_ROOT)\usr\lib\swift\dispatch\semaphore.h" />
+    <File Source="$(SDK_ROOT)\usr\include\dispatch\semaphore.h" />
   </Component>
   <Component>
-    <File Source="$(SDK_ROOT)\usr\lib\swift\dispatch\source.h" />
+    <File Source="$(SDK_ROOT)\usr\include\dispatch\source.h" />
   </Component>
   <Component>
-    <File Source="$(SDK_ROOT)\usr\lib\swift\dispatch\time.h" />
+    <File Source="$(SDK_ROOT)\usr\include\dispatch\time.h" />
   </Component>
 </Include>

platforms/Windows/sdk/_FoundationCShims.wxi

@@ -1,42 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
   <Component>
-    <File Source="$(SDK_ROOT)\usr\lib\swift\_FoundationCShims\bplist_shims.h" />
+    <File Source="$(SDK_ROOT)\usr\include\_FoundationCShims\bplist_shims.h" />
   </Component>
   <Component>
-    <File Source="$(SDK_ROOT)\usr\lib\swift\_FoundationCShims\CFUniCharBitmapData.h" />
+    <File Source="$(SDK_ROOT)\usr\include\_FoundationCShims\CFUniCharBitmapData.h" />
   </Component>
   <Component>
-    <File Source="$(SDK_ROOT)\usr\lib\swift\_FoundationCShims\CFUniCharBitmapData.inc.h" />
+    <File Source="$(SDK_ROOT)\usr\include\_FoundationCShims\CFUniCharBitmapData.inc.h" />
   </Component>
   <Component>
-    <File Source="$(SDK_ROOT)\usr\lib\swift\_FoundationCShims\filemanager_shims.h" />
+    <File Source="$(SDK_ROOT)\usr\include\_FoundationCShims\filemanager_shims.h" />
   </Component>
   <Component>
-    <File Source="$(SDK_ROOT)\usr\lib\swift\_FoundationCShims\io_shims.h" />
+    <File Source="$(SDK_ROOT)\usr\include\_FoundationCShims\io_shims.h" />
   </Component>
   <Component>
-    <File Source="$(SDK_ROOT)\usr\lib\swift\_FoundationCShims\module.modulemap" />
+    <File Source="$(SDK_ROOT)\usr\include\_FoundationCShims\module.modulemap" />
   </Component>
   <Component>
-    <File Source="$(SDK_ROOT)\usr\lib\swift\_FoundationCShims\platform_shims.h" />
+    <File Source="$(SDK_ROOT)\usr\include\_FoundationCShims\platform_shims.h" />
   </Component>
   <Component>
-    <File Source="$(SDK_ROOT)\usr\lib\swift\_FoundationCShims\string_shims.h" />
+    <File Source="$(SDK_ROOT)\usr\include\_FoundationCShims\string_shims.h" />
   </Component>
   <Component>
-    <File Source="$(SDK_ROOT)\usr\lib\swift\_FoundationCShims\uuid.h" />
+    <File Source="$(SDK_ROOT)\usr\include\_FoundationCShims\uuid.h" />
   </Component>
   <Component>
-    <File Source="$(SDK_ROOT)\usr\lib\swift\_FoundationCShims\_CShimsMacros.h" />
+    <File Source="$(SDK_ROOT)\usr\include\_FoundationCShims\_CShimsMacros.h" />
   </Component>
   <Component>
-    <File Source="$(SDK_ROOT)\usr\lib\swift\_FoundationCShims\_CShimsTargetConditionals.h" />
+    <File Source="$(SDK_ROOT)\usr\include\_FoundationCShims\_CShimsTargetConditionals.h" />
   </Component>
   <Component>
-    <File Source="$(SDK_ROOT)\usr\lib\swift\_FoundationCShims\_CStdlib.h" />
+    <File Source="$(SDK_ROOT)\usr\include\_FoundationCShims\_CStdlib.h" />
   </Component>
   <Component>
-    <File Source="$(SDK_ROOT)\usr\lib\swift\_FoundationCShims\_FoundationCShims.h" />
+    <File Source="$(SDK_ROOT)\usr\include\_FoundationCShims\_FoundationCShims.h" />
   </Component>
 </Include>