diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2012-05-18 13:34:22 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2012-05-18 13:34:22 (GMT) |
| commit | 3f90311bfeb87b869d7db5ea852dbd594de3378e (patch) | |
| tree | b4296447a7e30563d5e990da5d95ec18bf146355 /PC | |
| parent | 91d5e837cab7d2080139581c2f21899d7d3a6841 (diff) | |
| parent | b15d1a7981bcd0fc37b0f391dd98a96a5ed82d63 (diff) | |
| download | cpython-3f90311bfeb87b869d7db5ea852dbd594de3378e.zip cpython-3f90311bfeb87b869d7db5ea852dbd594de3378e.tar.gz cpython-3f90311bfeb87b869d7db5ea852dbd594de3378e.tar.bz2 | |
merge 3.2
Diffstat (limited to 'PC')
| -rw-r--r-- | PC/VC6/readme.txt | 5 | ||||
| -rw-r--r-- | PC/VS8.0/pyproject.vsprops | 2 | ||||
| -rw-r--r-- | PC/VS9.0/pyproject.vsprops | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/PC/VC6/readme.txt b/PC/VC6/readme.txt index 98d1e49..b6fa5d2 100644 --- a/PC/VC6/readme.txt +++ b/PC/VC6/readme.txt @@ -153,10 +153,9 @@ _ssl Unpack into the "dist" directory, retaining the folder name from the archive - for example, the latest stable OpenSSL will install as - dist/openssl-1.0.0a + dist/openssl-1.0.0j - You can (theoretically) use any version of OpenSSL you like - the - build process will automatically select the latest version. + You need to use version 1.0.0j of OpenSSL. You can install the NASM assembler from http://www.nasm.us/ diff --git a/PC/VS8.0/pyproject.vsprops b/PC/VS8.0/pyproject.vsprops index 7c53bba2..c311820 100644 --- a/PC/VS8.0/pyproject.vsprops +++ b/PC/VS8.0/pyproject.vsprops @@ -58,7 +58,7 @@ />
<UserMacro
Name="opensslDir"
- Value="$(externalsDir)\openssl-1.0.0a"
+ Value="$(externalsDir)\openssl-1.0.0j"
/>
<UserMacro
Name="tcltkDir"
diff --git a/PC/VS9.0/pyproject.vsprops b/PC/VS9.0/pyproject.vsprops index b3c1b4b..fa3dad7 100644 --- a/PC/VS9.0/pyproject.vsprops +++ b/PC/VS9.0/pyproject.vsprops @@ -62,7 +62,7 @@ />
<UserMacro
Name="opensslDir"
- Value="$(externalsDir)\openssl-1.0.0a"
+ Value="$(externalsDir)\openssl-1.0.0j"
/>
<UserMacro
Name="tcltkDir"
|