factotum/libressl-portable
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes to build asm on MSVS

Browse Source
This commit is contained in:
Brent Cook 2019-01-21 05:24:11 -06:00
parent 0ec8c536b9
commit 64d9c5d678
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -273,8 +273,9 @@ if(ENABLE_ASM)
endif()
elseif(APPLE AND "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
set(HOST_ASM_MACOSX_X86_64 true)
elseif(MSVC AND "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
elseif(MSVC AND "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "AMD64")
set(HOST_ASM_MASM_X86_64 true)
ENABLE_LANGUAGE(ASM_MASM)
elseif(CMAKE_SYSTEM_NAME MATCHES "MINGW" AND "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
set(HOST_ASM_MINGW64_X86_64 true)
endif()

2
crypto/CMakeLists.txt
View File

@ -147,7 +147,7 @@ if(HOST_ASM_MASM_X86_64)
add_definitions(-DWHIRLPOOL_ASM)
add_definitions(-DOPENSSL_CPUID_OBJ)
set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_MASM_SRC})
set_property(SOURCE ${ASM_X86_64_MASM_SRC} PROPERTY LANGUAGE C)
set_source_files_properties(${ASM_X86_64_MASM_SRC} PROPERTIES COMPILE_FLAGS "-x assembler-with-cpp")
endif()
if(HOST_ASM_MINGW64_X86_64)