diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-09-18 11:44:08 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-09-18 11:44:08 +0200 |
| commit | 4a03a8a1da1341fcceeb8a73a24ea1b4cedb443c (patch) | |
| tree | ae9b02dcb8c241b719e0f8ea7c4ef3fe991b9f3a /src/crypto | |
| parent | Merge pull request #1093 (diff) | |
| parent | cmake: support BUILD_SHARED_LIBS built-in option (diff) | |
| download | monero-4a03a8a1da1341fcceeb8a73a24ea1b4cedb443c.tar.xz | |
Merge pull request #1094
06bb692 cmake: support BUILD_SHARED_LIBS built-in option (redfish)
e1c7af3 cmake: transitive deps and remove deprecated LINK_* (redfish)
54010b9 crypto: armv7: slow-hash: remove redundant source include (redfish)
Diffstat (limited to 'src/crypto')
| -rw-r--r-- | src/crypto/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | src/crypto/slow-hash.c | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/crypto/CMakeLists.txt b/src/crypto/CMakeLists.txt index ed668022f..28f845d47 100644 --- a/src/crypto/CMakeLists.txt +++ b/src/crypto/CMakeLists.txt @@ -74,6 +74,11 @@ bitmonero_add_library(crypto ${crypto_sources} ${crypto_headers} ${crypto_private_headers}) +target_link_libraries(crypto + PUBLIC + ${Boost_SYSTEM_LIBRARY} + PRIVATE + ${EXTRA_LIBRARIES}) if (ARM) option(NO_OPTIMIZED_MULTIPLY_ON_ARM diff --git a/src/crypto/slow-hash.c b/src/crypto/slow-hash.c index 90fda3470..2ac303a36 100644 --- a/src/crypto/slow-hash.c +++ b/src/crypto/slow-hash.c @@ -939,7 +939,6 @@ void cn_slow_hash(const void *data, size_t length, char *hash) // ND: Some minor optimizations for ARMv7 (raspberrry pi 2), effect seems to be ~40-50% faster. // Needs more work. -#include "aesb.c" #ifdef NO_OPTIMIZED_MULTIPLY_ON_ARM /* The asm corresponds to this C code */ |