aboutsummaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2014-07-02 22:56:01 -0500
committerPaul Kehrer <paul.l.kehrer@gmail.com>2014-07-02 22:56:01 -0500
commit2a39f7f3c80b9c725b586ca96defbe5bad62bf83 (patch)
treeb5fba2d28e2d2b1b9de2fe3e8cf9e55ba9c95696 /docs
parent751c53b6f7cdc3e8301dd8672091acc105ed8874 (diff)
downloadcryptography-2a39f7f3c80b9c725b586ca96defbe5bad62bf83.tar.gz
cryptography-2a39f7f3c80b9c725b586ca96defbe5bad62bf83.tar.bz2
cryptography-2a39f7f3c80b9c725b586ca96defbe5bad62bf83.zip
switch to env variable based static/dynamic switch for windows
Diffstat (limited to 'docs')
-rw-r--r--docs/installation.rst18
1 files changed, 15 insertions, 3 deletions
diff --git a/docs/installation.rst b/docs/installation.rst
index 56d21e72..81e150de 100644
--- a/docs/installation.rst
+++ b/docs/installation.rst
@@ -45,13 +45,25 @@ dependencies are included. Just run
If you prefer to compile it yourself you'll need to have OpenSSL installed.
There are `pre-compiled binaries`_ available. If your installation is in an
unusual location set the ``LIB`` and ``INCLUDE`` environment variables to
-include the corresponding locations. For example:
+include the corresponding locations.For example:
.. code-block:: console
C:\> \path\to\vcvarsall.bat x86_amd64
- C:\> set LIB=C:\OpenSSL-1.0.1h-64bit\lib\VC\static;%LIB%
- C:\> set INCLUDE=C:\OpenSSL-1.0.1h-64bit\include;%INCLUDE%
+ C:\> set LIB=C:\OpenSSL\lib\VC\static;C:\OpenSSL\lib;%LIB%
+ C:\> set INCLUDE=C:\OpenSSL\include;%INCLUDE%
+ C:\> pip install cryptography
+
+You can also choose to build statically or dynamically using the
+``PYCA_OPENSSL_INSTALL`` variable. Allowed values are ``static`` (default) and
+``dynamic``.
+
+.. code-block:: console
+
+ C:\> \path\to\vcvarsall.bat x86_amd64
+ C:\> set LIB=C:\OpenSSL\lib\VC\static;C:\OpenSSL\lib;%LIB%
+ C:\> set INCLUDE=C:\OpenSSL\include;%INCLUDE%
+ C:\> set PYCA_OPENSSL_INSTALL=dynamic
C:\> pip install cryptography
Building cryptography on Linux