diff options
author | kinichiro <kinichiro.inoguchi@gmail.com> | 2019-05-19 13:20:06 +0900 |
---|---|---|
committer | Brent Cook <busterb@gmail.com> | 2019-06-10 06:49:34 -0500 |
commit | bbb662b69c48c07d93e642548c0f71ebbdc06d93 (patch) | |
tree | 3a174b52524071b7151b54a4c618315a06886ad7 /crypto | |
parent | c6f8ca2bc6b5bd8ca8842326f74e0cff007766ad (diff) | |
download | portable-bbb662b69c48c07d93e642548c0f71ebbdc06d93.tar.gz portable-bbb662b69c48c07d93e642548c0f71ebbdc06d93.tar.bz2 portable-bbb662b69c48c07d93e642548c0f71ebbdc06d93.zip |
Fix masm build
- Fix masm operators and comments
- Add -DOPENSSL_NO_ASM only if not 64 bit build
- Add -DCMAKE_INSTALL_PREFIX to avoid build error
Diffstat (limited to 'crypto')
-rw-r--r-- | crypto/CMakeLists.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt index e1b9287..4c902ad 100644 --- a/crypto/CMakeLists.txt +++ b/crypto/CMakeLists.txt | |||
@@ -920,7 +920,11 @@ endif() | |||
920 | if(NOT ENABLE_ASM) | 920 | if(NOT ENABLE_ASM) |
921 | add_definitions(-DOPENSSL_NO_ASM) | 921 | add_definitions(-DOPENSSL_NO_ASM) |
922 | else() | 922 | else() |
923 | if(WIN32) | 923 | if(MSVC) |
924 | if(NOT "${CMAKE_GENERATOR}" MATCHES "Win64") | ||
925 | add_definitions(-DOPENSSL_NO_ASM) | ||
926 | endif() | ||
927 | elseif(WIN32) | ||
924 | add_definitions(-DOPENSSL_NO_ASM) | 928 | add_definitions(-DOPENSSL_NO_ASM) |
925 | endif() | 929 | endif() |
926 | endif() | 930 | endif() |