diff options
author | Brent Cook <busterb@gmail.com> | 2019-01-21 20:15:30 -0600 |
---|---|---|
committer | Brent Cook <busterb@gmail.com> | 2019-01-21 20:15:30 -0600 |
commit | 495a1b631687f6cc1a1e9fe217aa17184a1b4aff (patch) | |
tree | af1f59c84dec68d3157be0521c26b4e5f8f3744c /crypto | |
parent | 501d61c681bfc8a1217ffaf9a07344ed986ee68c (diff) | |
download | portable-495a1b631687f6cc1a1e9fe217aa17184a1b4aff.tar.gz portable-495a1b631687f6cc1a1e9fe217aa17184a1b4aff.tar.bz2 portable-495a1b631687f6cc1a1e9fe217aa17184a1b4aff.zip |
more masm fixes, but disable for now
Diffstat (limited to 'crypto')
-rw-r--r-- | crypto/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt index 796f835..a81d329 100644 --- a/crypto/CMakeLists.txt +++ b/crypto/CMakeLists.txt | |||
@@ -147,7 +147,7 @@ if(HOST_ASM_MASM_X86_64) | |||
147 | add_definitions(-DWHIRLPOOL_ASM) | 147 | add_definitions(-DWHIRLPOOL_ASM) |
148 | add_definitions(-DOPENSSL_CPUID_OBJ) | 148 | add_definitions(-DOPENSSL_CPUID_OBJ) |
149 | set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_MASM_SRC}) | 149 | set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_MASM_SRC}) |
150 | set_property(SOURCE ${ASM_X86_64_MINGW64_SRC} PROPERTY LANGUAGE C) | 150 | set_property(SOURCE ${ASM_X86_64_MASM_SRC} PROPERTY LANGUAGE C) |
151 | endif() | 151 | endif() |
152 | 152 | ||
153 | if(HOST_ASM_MINGW64_X86_64) | 153 | if(HOST_ASM_MINGW64_X86_64) |