summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2009-08-14 09:10:07 (GMT)
committerRemko Tronçon <git@el-tramo.be>2009-08-16 22:13:28 (GMT)
commit8e53a2df443901f786932942759e5fe7b632852e (patch)
treeb9b92ec72ea28297021e5e97827da99943e72a74
parent516b334bd963452578367b2cd354db6c39ba99c9 (diff)
downloadswift-contrib-8e53a2df443901f786932942759e5fe7b632852e.zip
swift-contrib-8e53a2df443901f786932942759e5fe7b632852e.tar.bz2
Update Windows build documentation.
-rw-r--r--Documentation/API/Doxyfile (renamed from doc/API/Doxyfile)0
-rw-r--r--Documentation/BuildingOnWindows.txt27
-rw-r--r--doc/BuildingOnWindows.txt34
3 files changed, 27 insertions, 34 deletions
diff --git a/doc/API/Doxyfile b/Documentation/API/Doxyfile
index c419359..c419359 100644
--- a/doc/API/Doxyfile
+++ b/Documentation/API/Doxyfile
diff --git a/Documentation/BuildingOnWindows.txt b/Documentation/BuildingOnWindows.txt
new file mode 100644
index 0000000..27c5cc3
--- /dev/null
+++ b/Documentation/BuildingOnWindows.txt
@@ -0,0 +1,27 @@
+Prerequisites
+------------
+- Qt Open Source Edition
+- Microsoft Visual C++ Express Edition
+- Python
+- OpenSSL
+ * Download and extract the Windows binary version of OpenSSL from
+ http://www.slproweb.com/products/Win32OpenSSL.html
+
+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
+- Go to the Swift source dir
+- Create a file 'config.py' with the following contents, reflecting your local
+ setup:
+ openssl = "path\to\openssl"
+ qt = "path\to\qt"
+- Run 'scons'
diff --git a/doc/BuildingOnWindows.txt b/doc/BuildingOnWindows.txt
deleted file mode 100644
index 8ef6df4..0000000
--- a/doc/BuildingOnWindows.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-Prerequisites
-------------
-- 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)
-
-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-openssl=/path/to/openssl
-- Run 'make' \ No newline at end of file