updated Jamfile to support openssl on windows, added missing files to makefiles and made test_pe_crypto build when encryption is disabled

This commit is contained in:
Arvid Norberg
2007-06-13 01:48:24 +00:00
parent 5b5f3b3ca2
commit fa1a37e649
8 changed files with 120 additions and 74 deletions

View File

@@ -213,10 +213,16 @@ Build features:
| | * ``shipped`` - links against the zlib bundled |
| | with the libtorrent package. |
+------------------------+----------------------------------------------------+
| ``pe-support`` | * ``on`` - turns on support for encrypted |
| ``openssl`` | * ``pe`` - turns on support for encrypted |
| | connections. requires openssl (libcrypto) |
| | * ``sha-1`` - openssl will be used instead of the |
| | public domain SHA-1 implementation shipped with |
| | libtorrent. ``libcrypto.a`` will be required for |
| | linking. Encryption support is still turned off. |
| | * ``off`` - turns off support for encrypted |
| | connections. openssl is not linked in. |
| | connections. openssl is not linked in. The |
| | shipped public domain SHA-1 implementation is |
| | used. |
+------------------------+----------------------------------------------------+
| ``link`` | * ``static`` - builds libtorrent as a static |
| | library (.a / .lib) |
@@ -236,14 +242,6 @@ Build features:
| | * ``profile`` - builds libtorrent with profile |
| | information. |
+------------------------+----------------------------------------------------+
| ``openssl`` | * ``on`` - openssl will be used instead of the |
| | public domain SHA-1 implementation shipped with |
| | libtorrent. ``crypto.lib`` or ``libcrypto.a`` |
| | will be required for linking. |
| | * ``off`` - the shipped SHA-1 implementation will |
| | be used, and there will be no dependency on |
| | openssl. |
+------------------------+----------------------------------------------------+
| ``character-set`` | This setting will only have an affect on windows. |
| | Other platforms are expected to support UTF-8. |
| | |