summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Lewman <andrew@torproject.org>2010-02-17 13:37:51 -0500
committerNick Mathewson <nickm@torproject.org>2010-02-17 23:07:51 -0500
commit7f3b85d1df5120f7e60b94ac54525a7252333d43 (patch)
tree9c2d049df692ea7e217c1c577125cd1f8738021f
parentde0330b0929a83dc765f51bb6997f2cc8b7618be (diff)
downloadtor-7f3b85d1df5120f7e60b94ac54525a7252333d43.tar.gz
tor-7f3b85d1df5120f7e60b94ac54525a7252333d43.zip
fix the win32 build instructions for openssl.
-rw-r--r--doc/tor-win32-mingw-creation.txt11
1 files changed, 6 insertions, 5 deletions
diff --git a/doc/tor-win32-mingw-creation.txt b/doc/tor-win32-mingw-creation.txt
index f585471a49..4a25e47a85 100644
--- a/doc/tor-win32-mingw-creation.txt
+++ b/doc/tor-win32-mingw-creation.txt
@@ -11,15 +11,17 @@ http://prdownloads.sf.net/mingw/MinGW-5.1.6.exe?download
Download msys:
http://prdownloads.sf.net/ming/MSYS-1.0.11.exe?download
-Install MinGW and MSYS.
+Download msysDTK:
+http://sourceforge.net/projects/mingw/files/MSYS%20Supplementary%20Tools/msysDTK-1.0.1/msysDTK-1.0.1.exe/download
-Open an MSYS window. Extract mingw-autoconf-2.5-2.64-1-mingw32-bin.tar.gz
-to /c/MinGW/.
+Install MinGW, msysDTK, and MSYS in that order.
Make sure your PATH includes C:\MinGW\bin. You can verify this by right
clicking on "My Computer", choose "Properties", choose "Advanced",
choose "Environment Variables", select PATH.
+Start MSYS(rxvt).
+
Create a directory called "tor-mingw".
Stage Two: Download, extract, compile openssl
@@ -46,7 +48,7 @@ Type "cd ../ssl/"
Type "find ./ -name "*.h" -exec cp {} ../include/openssl/ \;"
Type "cd .."
Type "cp *.h include/openssl/"
-Type "cp fips/fips.h include/openssl/"
+Type "find ./fips -type f -name "*.h" -exec cp {} include/openssl/ \;"
# The next steps can take up to 30 minutes to complete.
Type "make"
Type "make install"
@@ -115,4 +117,3 @@ From the Tor build directory above, run:
"./contrib/package_nsis-mingw.sh"
The resulting Tor installer executable is in ./win_tmp/.
-