From 13ec84712a12272bd465f37503edad7a2763b322 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Remko=20Tron=C3=A7on?= <git@el-tramo.be>
Date: Sat, 6 Jun 2009 21:28:45 +0200
Subject: Update Windows build documentation.


diff --git a/doc/BuildingOnWindows.txt b/doc/BuildingOnWindows.txt
index 97a6c76..8ef6df4 100644
--- a/doc/BuildingOnWindows.txt
+++ b/doc/BuildingOnWindows.txt
@@ -1,34 +1,34 @@
-Prerquisites
+Prerequisites
 ------------
-- MinGW
-  * Install the self-extracting executable package from
-    http://mingw.org
-  * 
-- MSYS
-  * Install the self-extracting executable package
-    http://www.mingw.org/wiki/msys
-- autoconf/automake (Only required when building from the Git tree)
-  * These packages are included in msysDTK, but are too old.
-  * To compile autoconf/automake, first install either msysdtk, or the m4, crypt and perl packages for msys.
-  * Download & extract the latest packages from http://ftp.gnu.org/gnu/autoconf/
-    and http://ftp.gnu.org/gnu/automake
-  * Configure the packages with 
-      ./configure --prefix=/mingw
-  * Run 'make' and 'make install'
+- Qt Open Source Edition
+- Microsoft Visual C++ Express Edition
+- Cygwin
+  * Make sure the following tools are installed in Cygwin: 
+    - make, python, gcc-core, gcc-g++
+    - autoconf, automake (Only necessary when using the development version) 
 - OpenSSL
   * Download and extract the Windows binary version of OpenSSL from
     http://www.slproweb.com/products/Win32OpenSSL.html
   * TODO: Check whether the version from msysDTK works as well. If it does,
     the Makefile and configure script should be adapted, because they assume
     that --with-openssl is set (which may not be necessary)
-- Expat
-  * Download, configure, and install  the source from 
-    http://expat.sourceforge.net/
-    The binary package will not do.
 
-Building
---------
+Building Qt for Microsoft Visual C++
+------------------------------------
+- From the 'Visual C++' 'Programs' group, launch the Visual C++ command prompt
+- Go to the dir where you installed Qt
+- Configure Qt:
+    configure
+- Build Qt:
+    nmake
+
+Building Swift
+--------------
+- From the 'Visual C++' 'Programs' group, launch the Visual C++ command prompt
+- From the command prompt, start Cygwin:
+    C:\Path\To\Cygwin\cygwin
+- Go to the Swift source dir
+- (If using the development version, run 'autoconf/autogen.sh')
 - Configure the build
-    ./configure --with-expat=/path/to/expat --with-openssl=/path/to/openssl
-- Run 'make', watch it fail (until this gets fixed)
-- go to src/Swift, run 'make'
+    ./configure --with-openssl=/path/to/openssl
+- Run 'make'
\ No newline at end of file
-- 
cgit v0.10.2-6-g49f6