diff options
| author | Riccardo Spagni <ric@spagni.net> | 2015-01-27 09:08:09 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2015-01-27 09:09:42 +0200 |
| commit | bd10324f0d1f185bb0800f6aa94293d15fbd8d9a (patch) | |
| tree | e561d3854f5cef45305b9efd34a847209521ec99 | |
| parent | fixed AES support flag (diff) | |
| parent | remove aes flag, detect no sse2 (diff) | |
| download | monero-bd10324f0d1f185bb0800f6aa94293d15fbd8d9a.tar.xz | |
Merge pull request #218
2b3b70a remove aes flag, detect no sse2 (Riccardo Spagni)
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/crypto/slow-hash.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ed5a25dfc..4c1209e08 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -185,8 +185,8 @@ else() if (NO_AES) message(STATUS "Disabling AES support") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_FLAG} ${WARNINGS} ${C_WARNINGS} ${ARCH_FLAG} -mno-aes") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -D_GNU_SOURCE ${MINGW_FLAG} ${WARNINGS} ${CXX_WARNINGS} ${ARCH_FLAG} -mno-aes") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_FLAG} ${WARNINGS} ${C_WARNINGS} ${ARCH_FLAG}") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -D_GNU_SOURCE ${MINGW_FLAG} ${WARNINGS} ${CXX_WARNINGS} ${ARCH_FLAG}") else() message(STATUS "Enabling AES support") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_FLAG} ${WARNINGS} ${C_WARNINGS} ${ARCH_FLAG} -maes") diff --git a/src/crypto/slow-hash.c b/src/crypto/slow-hash.c index 9b9eecba3..2b9cb0ee5 100644 --- a/src/crypto/slow-hash.c +++ b/src/crypto/slow-hash.c @@ -37,7 +37,9 @@ #include "hash-ops.h" #include "oaes_lib.h" +#ifndef __SSE2__ #include <emmintrin.h> +#else #if defined(_MSC_VER) #include <intrin.h> |