浏览代码

fix the win32 build instructions for openssl.

Andrew Lewman 15 年之前
父节点
当前提交
7f3b85d1df
共有 1 个文件被更改,包括 6 次插入5 次删除
  1. 6 5
      doc/tor-win32-mingw-creation.txt

+ 6 - 5
doc/tor-win32-mingw-creation.txt

@@ -11,15 +11,17 @@ http://prdownloads.sf.net/mingw/MinGW-5.1.6.exe?download
 Download msys:
 Download msys:
 http://prdownloads.sf.net/ming/MSYS-1.0.11.exe?download
 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
 Make sure your PATH includes C:\MinGW\bin.  You can verify this by right
 clicking on "My Computer", choose "Properties", choose "Advanced",
 clicking on "My Computer", choose "Properties", choose "Advanced",
 choose "Environment Variables", select PATH.
 choose "Environment Variables", select PATH.
 
 
+Start MSYS(rxvt).
+
 Create a directory called "tor-mingw".
 Create a directory called "tor-mingw".
 
 
 Stage Two:  Download, extract, compile openssl
 Stage Two:  Download, extract, compile openssl
@@ -46,7 +48,7 @@ Type "cd ../ssl/"
 Type "find ./ -name "*.h" -exec cp {} ../include/openssl/ \;"
 Type "find ./ -name "*.h" -exec cp {} ../include/openssl/ \;"
 Type "cd .."
 Type "cd .."
 Type "cp *.h include/openssl/"
 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.
 # The next steps can take up to 30 minutes to complete.
 Type "make"
 Type "make"
 Type "make install"
 Type "make install"
@@ -115,4 +117,3 @@ From the Tor build directory above, run:
 "./contrib/package_nsis-mingw.sh"
 "./contrib/package_nsis-mingw.sh"
 
 
 The resulting Tor installer executable is in ./win_tmp/.
 The resulting Tor installer executable is in ./win_tmp/.
-