Skip to content

Commit 6cdcb39

Browse files
committed
---
yaml --- r: 347062 b: refs/heads/master c: d97678c h: refs/heads/master
1 parent e8f128e commit 6cdcb39

File tree

2 files changed

+17
-9
lines changed

2 files changed

+17
-9
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 00e8d0b785845a9e53ebb55e9d43c73accd8dfd9
2+
refs/heads/master: d97678cfb228dbbade0dd14788e1b0e4b21fb660
33
refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
44
refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
55
refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/docs/WindowsBuild.md

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ it provides some of the needed headers and libraries.
4141
1. Clone `apple/swift-corelibs-foundation` into a folder named `swift-corelibs-foundation`
4242
1. Clone `apple/swift-corelibs-xctest` into a folder name `swift-corelibs-xctest`
4343
1. Clone `apple/swift-lldb` into a folder named `lldb`
44+
1. Clone `curl` into a folder named `curl`
4445
1. Clone `libxml2` into a folder named `libxml2`
4546

4647
- Currently, other repositories in the Swift project have not been tested and
@@ -64,6 +65,7 @@ git clone https://github.com/apple/swift-corelibs-libdispatch
6465
git clone https://github.com/apple/swift-corelibs-foundation
6566
git clone https://github.com/apple/swift-corelibs-xctest
6667
git clone https://github.com/apple/swift-lldb lldb
68+
git clone https://github.com/curl/curl.git curl
6769
git clone https://gitlab.gnome.org/GNOME/libxml2.git libxml2
6870
```
6971

@@ -248,7 +250,17 @@ cmake --build S:\b\libdispatch
248250
path S:\b\libdispatch;S:\b\libdispatch\src;%PATH%
249251
```
250252

251-
### 11. Build libxml2
253+
### 11. Build curl
254+
255+
```cmd
256+
pushd "S:\curl"
257+
.\buildconf.bat
258+
cd winbuild
259+
nmake /f Makefile.vc mode=static VC=15 MACHINE=x64
260+
popd
261+
```
262+
263+
### 12. Build libxml2
252264

253265
```cmd
254266
pushd "S:\libxml2\win32"
@@ -257,11 +269,7 @@ nmake /f Makefile.msvc
257269
popd
258270
```
259271

260-
### 12. Build swift-corelibs-foundation
261-
262-
To build Foundation you will need builds of:
263-
264-
- `libcurl` (https://curl.haxx.se, download the source, `cd` into `winbuild`, and run `nmake /f Makefile.vc mode=static VC=15 MACHINE=x64`)
272+
### 13. Build swift-corelibs-foundation
265273

266274
```cmd
267275
mkdir "S:\b\foundation"
@@ -288,7 +296,7 @@ cmake -G Ninja^
288296
path S:\b\foundation;%PATH%
289297
```
290298

291-
### 13. Build swift-corelibs-xctest
299+
### 14. Build swift-corelibs-xctest
292300

293301
```cmd
294302
mkdir "S:\b\xctest"
@@ -313,7 +321,7 @@ cmake --build S:\b\xctest
313321
path S:\b\xctest;%PATH%
314322
```
315323

316-
### 14. Install Swift on Windows
324+
### 15. Install Swift on Windows
317325

318326
- Run ninja install:
319327

0 commit comments

Comments
 (0)